diff options
| author | pho <pho@pkgsrc.org> | 2014-02-28 04:23:14 +0000 |
|---|---|---|
| committer | pho <pho@pkgsrc.org> | 2014-02-28 04:23:14 +0000 |
| commit | be2187ba341a8ab945453576ec8aa02e24d9a2de (patch) | |
| tree | ebcb7870e83fba18ab825374a7522460db94a216 | |
| parent | dcde84515c401ac2954d48ca92af9a5118331b40 (diff) | |
| download | pkgsrc-be2187ba341a8ab945453576ec8aa02e24d9a2de.tar.gz | |
Fix breakage on platforms including Linux where `libtool --mode=link' does not automatically hard-code library run-time paths into executables.
| -rw-r--r-- | graphics/jbigkit/distinfo | 4 | ||||
| -rw-r--r-- | graphics/jbigkit/patches/patch-ab | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/graphics/jbigkit/distinfo b/graphics/jbigkit/distinfo index 91a320f1985..c497990d1ee 100644 --- a/graphics/jbigkit/distinfo +++ b/graphics/jbigkit/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2013/08/04 09:22:25 adam Exp $ +$NetBSD: distinfo,v 1.3 2014/02/28 04:23:14 pho Exp $ SHA1 (jbigkit-2.0.tar.gz) = cfb7d3121f02a74bfb229217858a0d149b6589ef RMD160 (jbigkit-2.0.tar.gz) = 4b1b8358203c2bd86e034703d666c1453c60e572 Size (jbigkit-2.0.tar.gz) = 435027 bytes SHA1 (patch-aa) = f11a943be8a0061dc535d210a4374721e453abe9 -SHA1 (patch-ab) = 0e8cc75d45ca6d3ca475d37b486f97284618d205 +SHA1 (patch-ab) = 011d3e325a400a850b12efa5a87956da1f9bc206 diff --git a/graphics/jbigkit/patches/patch-ab b/graphics/jbigkit/patches/patch-ab index e20820e6e7d..3d426447147 100644 --- a/graphics/jbigkit/patches/patch-ab +++ b/graphics/jbigkit/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2013/08/04 09:22:25 adam Exp $ +$NetBSD: patch-ab,v 1.3 2014/02/28 04:23:14 pho Exp $ libtoolize @@ -20,27 +20,28 @@ libtoolize -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a - $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig +pbmtojbg: pbmtojbg.lo -+ ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la ++ ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -rpath ${PREFIX}/lib -jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a - $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig +jbgtopbm: jbgtopbm.lo -+ ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la ++ ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -rpath ${PREFIX}/lib -pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a - $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85 +pbmtojbg85: pbmtojbg85.lo -+ ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la ++ ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -rpath ${PREFIX}/lib -jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a - $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85 -+jbgtopbm85: jbgtopbm85.lo -+ ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la - +- -jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h -pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h -jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h -pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h ++jbgtopbm85: jbgtopbm85.lo ++ ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -rpath ${PREFIX}/lib ++ +jbgtopbm.lo: jbgtopbm.c ../libjbig/jbig.h +pbmtojbg.lo: pbmtojbg.c ../libjbig/jbig.h +jbgtopbm85.lo: jbgtopbm85.c ../libjbig/jbig85.h |