Commit 3327f42f authored by Jelmer Vernooij's avatar Jelmer Vernooij

Drop patch 03_revert_ldflags_atend: applied upstream.

parent a31c0916
ldb (2:1.1.21-1) UNRELEASED; urgency=medium
* New upstream release.
* Drop patch 03_revert_ldflags_atend: applied upstream.
-- Jelmer Vernooij <jelmer@debian.org> Sat, 19 Sep 2015 03:01:43 +0000
......
Author: Jelmer Vernooij <jelmer@samba.org>
Description: Revert adding LDFLAGS to the end of the ld command-line, preventing use of -Wl,--as-needed
Status: forwarded-upstream
diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py
index 5def580..51d514e 100644
--- a/buildtools/wafsamba/samba_optimisation.py
+++ b/buildtools/wafsamba/samba_optimisation.py
@@ -287,45 +287,3 @@ def samba_before_apply_obj_vars(self):
for i in v['LIBPATH']:
if is_standard_libpath(v, i):
v['LIBPATH'].remove(i)
-
-@feature('cc')
-@before('apply_incpaths', 'apply_obj_vars_cc')
-def samba_stash_cppflags(self):
- """Fix broken waf ordering of CPPFLAGS"""
-
- self.env.SAVED_CPPFLAGS = self.env.CPPFLAGS
- self.env.CPPFLAGS = []
-
-@feature('cc')
-@after('apply_incpaths', 'apply_obj_vars_cc')
-def samba_pop_cppflags(self):
- """append stashed user CPPFLAGS after our internally computed flags"""
-
- #
- # Note that we don't restore the values to 'CPPFLAGS',
- # but to _CCINCFLAGS instead.
- #
- # buildtools/wafadmin/Tools/cc.py defines the 'cc' task generator as
- # '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}'
- #
- # Our goal is to effectively invert the order of ${CPPFLAGS} and
- # ${_CCINCFLAGS}.
- self.env.append_value('_CCINCFLAGS', self.env.SAVED_CPPFLAGS)
- self.env.SAVED_CPPFLAGS = []
-
-@feature('cprogram', 'cshlib', 'cstaticlib')
-@before('apply_obj_vars', 'add_extra_flags')
-def samba_stash_linkflags(self):
- """stash away LINKFLAGS in order to fix waf's broken ordering wrt or
- user LDFLAGS"""
-
- self.env.SAVE_LINKFLAGS = self.env.LINKFLAGS
- self.env.LINKFLAGS = []
-
-@feature('cprogram', 'cshlib', 'cstaticlib')
-@after('apply_obj_vars', 'add_extra_flags')
-def samba_pop_linkflags(self):
- """after apply_obj_vars append saved LDFLAGS"""
-
- self.env.append_value('LINKFLAGS', self.env.SAVE_LINKFLAGS)
- self.env.SAVE_LINKFLAGS = []
01_manpage_dates
02_hurd
03_revert_ldflags_atend
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment