diff options
| author | leot <leot@pkgsrc.org> | 2017-07-16 08:29:53 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2017-07-16 08:29:53 +0000 |
| commit | 774da2e067b1696fa2bc552883259cb31f175c38 (patch) | |
| tree | d6ed48fb39c0660c48922cf8c46665cdab008c56 /print/mupdf/patches | |
| parent | 452ee83fbeacda41a3ff2c00aecfee8e0bac5fcc (diff) | |
| download | pkgsrc-774da2e067b1696fa2bc552883259cb31f175c38.tar.gz | |
Do not possibly (re)initialize LDFLAGS and pass it also to AR_CMD.
This fixes RELRO build.
Bump PKGREVISION
Diffstat (limited to 'print/mupdf/patches')
| -rw-r--r-- | print/mupdf/patches/patch-ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/print/mupdf/patches/patch-ac b/print/mupdf/patches/patch-ac index 835fe1956f8..51ae7871306 100644 --- a/print/mupdf/patches/patch-ac +++ b/print/mupdf/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.16 2017/04/12 13:03:08 leot Exp $ +$NetBSD: patch-ac,v 1.17 2017/07/16 08:29:53 leot Exp $ o libtool support o Install target cleanup @@ -9,7 +9,7 @@ o Get rid of unused VERSION variable and `version:' target (otherwise `git' can o Install only one "mupdf" binary, prefer the featureful one and always install it as "mupdf" ---- Makefile.orig 2017-03-31 14:23:45.000000000 +0000 +--- Makefile.orig 2017-04-05 11:02:21.000000000 +0000 +++ Makefile @@ -57,65 +57,51 @@ ALL_DIR += $(OUT)/platform/gl @@ -37,7 +37,7 @@ o Install only one "mupdf" binary, prefer the featureful one and always -WINDRES_CMD = $(QUIET_WINDRES) $(WINDRES) $< $@ +CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $< +CXX_CMD = ${LIBTOOL} --mode=compile $(CXX) $(CFLAGS) -o $@ -c $< -+AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^ ++AR_CMD = ${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $@ -version-info 0:0:0 -rpath ${PREFIX}/lib $^ +LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) +MKDIR_CMD = mkdir -p $@ +RM_CMD = rm -f $@ |