[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, master, updated. debian/0.9.9.050+svn20081206-1-1136-g2dd6d5f

[Albin Tonnerre]

The following commit has been merged in the master branch:
commit 2dd6d5fc1f4139089f555b57119434e3c621c653
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Tue May 26 20:56:32 2009 +0200

    Build with -Wl,-z,defs for extra security. Drop 0001-Add-libtool-Wl-as-needed-reordering-workaround.patch, works fine without it

diff --git a/debian/patches/0001-Add-libtool-Wl-as-needed-reordering-workaround.patch b/debian/patches/0001-Add-libtool-Wl-as-needed-reordering-workaround.patch
deleted file mode 100644
index 1ca6afc..0000000
--- a/debian/patches/0001-Add-libtool-Wl-as-needed-reordering-workaround.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a314297d80e8156245bc1f5ff389bd6d868cc9f1 Mon Sep 17 00:00:00 2001
-From: Albin Tonnerre <albin.tonnerre at gmail.com>
-Date: Fri, 12 Dec 2008 23:57:06 +0100
-Subject: [PATCH] Add libtool -Wl,--as-needed reordering workaround
-
----
- ltmain.sh |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/ltmain.sh b/ltmain.sh
-index 0bf3848..ff10731 100644
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -1807,6 +1807,11 @@ EOF
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;; 
-+
-       -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2150,6 +2155,15 @@ EOF
- 	lib=
- 	found=no
- 	case $deplib in
-+	-Wl,--as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
--- 
-1.5.6.5
-
diff --git a/debian/patches/series b/debian/patches/series
index 2ddc315..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Add-libtool-Wl-as-needed-reordering-workaround.patch
diff --git a/debian/rules b/debian/rules
index 8c6edbb..7ad8fee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-LDFLAGS += -Wl,--as-needed
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 build/libedje-doc::
 	$(MAKE) doc

-- 
Enlightenment DR17 graphical layout and animation library