pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

moreutils: honor LDFLAGS for RELRO build.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Jul 12 14:19:20 2017 +0200
Changeset:	e2b7d6c6b2d32f17c5c788d87d906aa484b85288

Modified Files:
	moreutils/Makefile
	moreutils/distinfo
	moreutils/patches/patch-Makefile
Added Files:
	moreutils/patches/patch-is__utf8_Makefile

Log Message:
moreutils: honor LDFLAGS for RELRO build.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e2b7d6c6b2d32f17c5c788d87d906aa484b85288

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 moreutils/Makefile                        |  1 +
 moreutils/distinfo                        |  3 ++-
 moreutils/patches/patch-Makefile          |  5 +++--
 moreutils/patches/patch-is__utf8_Makefile | 19 +++++++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diffs:
diff --git a/moreutils/Makefile b/moreutils/Makefile
index 7af2df07a1..41655f407e 100644
--- a/moreutils/Makefile
+++ b/moreutils/Makefile
@@ -36,6 +36,7 @@ SUBST_SED.pkgmandir=		-e 's,share/man,${PKGMANDIR},'
 MAKE_ENV+=	\
 	PREFIX=${PREFIX} \
 	CFLAGS=${CFLAGS:Q} \
+	LDFLAGS=${LDFLAGS:Q} \
 	DOCBOOKXSL=${PREFIX}/share/xsl/docbook \
 	INSTALL_BIN=${INSTALL_PROGRAM:Q} \
 	INSTALL_MAN=${INSTALL_MAN:Q} \
diff --git a/moreutils/distinfo b/moreutils/distinfo
index 5879278541..b3b8eb2ba8 100644
--- a/moreutils/distinfo
+++ b/moreutils/distinfo
@@ -4,5 +4,6 @@ SHA1 (moreutils_0.60.orig.tar.xz) = 3af60490f763ece48b2fcba968903673c3e63495
 RMD160 (moreutils_0.60.orig.tar.xz) = aa3700e114f51513bf52123eae19d3f9625d7052
 SHA512 (moreutils_0.60.orig.tar.xz) = 3fb5d8e140a90d805c4cd0de74248a5ea830ba8f90c56afdeb537391c32984cbb9701d4d9caf187a5f9284dfe791d1f7a333af3aac2a4860e2041c414e5cb788
 Size (moreutils_0.60.orig.tar.xz) = 79360 bytes
-SHA1 (patch-Makefile) = d01222065c1e751a326248d70219f26952e0b42a
+SHA1 (patch-Makefile) = 757f0d98eaa43537dfaadcda87346562e3a2137c
 SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
+SHA1 (patch-is__utf8_Makefile) = 8feacdc8a0a0939aefd7f647be8196bdfdbda66c
diff --git a/moreutils/patches/patch-Makefile b/moreutils/patches/patch-Makefile
index 248d6eaced..f91fb82a97 100644
--- a/moreutils/patches/patch-Makefile
+++ b/moreutils/patches/patch-Makefile
@@ -21,9 +21,10 @@ corresponding INSTALL_{MAN,SCRIPT} in a similar vein of INSTALL_BIN.
 -	install $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
 +	$(INSTALL_SCRIPT) $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
  
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+-	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
 -	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
-+	$(INSTALL_MAN) $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
++	mkdir -p $(DESTDIR)$(PREFIX)/man/man1
++	$(INSTALL_MAN) $(MANS) $(DESTDIR)$(PREFIX)/man/man1
  
  check: isutf8
  	./is_utf8/test.sh
diff --git a/moreutils/patches/patch-is__utf8_Makefile b/moreutils/patches/patch-is__utf8_Makefile
new file mode 100644
index 0000000000..f2a2d5f7cc
--- /dev/null
+++ b/moreutils/patches/patch-is__utf8_Makefile
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Honor LDFLAGS for RELRO builds.
+
+--- is_utf8/Makefile.orig	2016-08-13 13:58:21.000000000 +0000
++++ is_utf8/Makefile
+@@ -41,10 +41,10 @@ CC = gcc
+ CFLAGS = -O3 -Wextra -Wall -ansi -Wstrict-prototypes
+ 
+ $(NAME): $(OBJ)
+-	$(CC) $(CFLAGS) -o $(NAME) $(OBJ)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(NAME) $(OBJ)
+ 
+ IS_UTF8_LIB:
+-	$(CC) --shared -fPIC $(CFLAGS) $(LIB_SRC) -o $(LINKERNAME)
++	$(CC) --shared -fPIC $(CFLAGS) $(LDFLAGS) $(LIB_SRC) -o $(LINKERNAME)
+ 
+ all:
+ 		@make $(NAME)


Home | Main Index | Thread Index | Old Index