From b52519aa74464e561c2fa883c39685a85547d88a Mon Sep 17 00:00:00 2001 From: Tristan Seligmann Date: Sun, 14 Dec 2014 05:55:25 +0200 Subject: Handle Makefile differently. --- debian/patches/fix-makefile | 21 +++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 --- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 debian/patches/fix-makefile create mode 100644 debian/patches/series diff --git a/debian/patches/fix-makefile b/debian/patches/fix-makefile new file mode 100644 index 0000000..3a19cf8 --- /dev/null +++ b/debian/patches/fix-makefile @@ -0,0 +1,21 @@ +Description: Fix makefile flag handling +Author: Tristan Seligmann +Origin: vendor +Forwarded: no +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: libscrypt/Makefile +=================================================================== +--- libscrypt.orig/Makefile 2014-12-14 02:38:36.667099740 +0200 ++++ libscrypt/Makefile 2014-12-14 05:53:34.488194255 +0200 +@@ -5,8 +5,8 @@ + INSTALL_DATA ?= install + + CC?=gcc +-CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC +-LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version ++CFLAGS+=-fPIC ++LDFLAGS+=-Wl,-z,now -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version + CFLAGS_EXTRA?=-Wl,-rpath=. + + all: reference diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4f20ff2 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-makefile diff --git a/debian/rules b/debian/rules index ba1ff64..cf18250 100755 --- a/debian/rules +++ b/debian/rules @@ -4,9 +4,6 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -export DEB_CFLAGS_MAINT_APPEND=-fPIC -export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,now -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version - %: dh $@ -- cgit v1.2.3