diff options
| author |   Sébastien Fabbro <sebfabbro@gmail.com> | 2010-12-20 07:47:35 +0000 |
|---|---|---|
| committer | Sébastien Fabbro <sebfabbro@gmail.com> | 2010-12-20 07:47:35 +0000 |
| commit | d8d2ada4d4eb8637d3b0215e58f2369a847694a7 (patch) | |
| tree | ed3a06573a823099aade1dde64e5876d65d614a6 | |
| parent | Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff) | |
| download | sci-d8d2ada4d4eb8637d3b0215e58f2369a847694a7.tar.gz sci-d8d2ada4d4eb8637d3b0215e58f2369a847694a7.tar.bz2 sci-d8d2ada4d4eb8637d3b0215e58f2369a847694a7.zip | |
[sci-physics/root] bump
14 files changed, 835 insertions, 880 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 081fdbbd3..e1ba1070f 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,24 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.73 2010/07/10 19:05:23 armin76 Exp $ +*root-5.28.00 (20 Dec 2010) + + 20 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> -root-5.26.00e.ebuild, + -files/root-5.26.00e-configure-paths.patch, + -files/root-5.26.00e-glibc212.patch, -files/root-5.26.00e-make-3.82.patch, + -files/root-5.26.00e-nobyte-compile.patch, + -files/root-5.26.00e-prop-ldflags.patch, + -files/root-5.26.00e-xrootd-prop-flags.patch, +root-5.28.00.ebuild, + +files/root-5.28.00-asneeded.patch, + +files/root-5.28.00-configure-paths.patch, + +files/root-5.28.00-glibc212.patch, +files/root-5.28.00-nobyte-compile.patch, + +files/root-5.28.00-prop-ldflags.patch, +files/root-5.28.00-unuran.patch, + +files/root-5.28.00-xrootd-prop-flags.patch, metadata.xml: + Version bump. Still a bit experimental. Changed python directory and ruby + directory to more standard paths. Unbundled unuran. A few more options. + Thanks much to Andrew Savchenko for his work on the patches (bug #348993). + Also prefix clean, bug #346933, thanks XU Benda + 16 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org> root-5.26.00e.ebuild, +files/root-5.26.00e-make-3.82.patch: backport upstream patch to fix build with gmake-3.82 diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 5fcca84a3..4fc0a98bf 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -2,20 +2,21 @@ AUX olbd.confd 197 RMD160 798de1808502f3e4ecfc5f024b56a419d9824057 SHA1 f2a4385f AUX olbd.initd 714 RMD160 8c3e427b54b79408c9b1e1fbf895c59c665fb4d6 SHA1 d625878c925db41e2319867b00926d1e468150fe SHA256 d4cecbd149e4e25e65ea60e68fb5409e34d32f7f577d535b51a2491f8b12964e AUX proofd.confd 415 RMD160 3814aacb63d82b9d060086f9bef304d431a15b4e SHA1 31eb7af239a0042f887b5089a7c6c7ec5d6662e9 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38 AUX proofd.initd 717 RMD160 c93c8d99cb2cfb50ed8269af40fcdfb226ed8008 SHA1 dc4e761bf45920dcdaa25d97085364b8c272a6b5 SHA256 780f5ff7d033146d2cec20e246f3ed7379f1ed65642ef5f4cf018f47b4766a1e -AUX root-5.26.00e-configure-paths.patch 1327 RMD160 ca926e9eddd5a88f5b3e4efd79c36f8bd0931058 SHA1 1d8112dd31c532560b0b571f6548961226b21e1d SHA256 f96707b3119b2e501cd9fbb6a3cbfbee6868786d3750581bcf34c8982314f97b -AUX root-5.26.00e-glibc212.patch 275 RMD160 df6ffa73349476e750eee09e24897747fec4e369 SHA1 cb80280498bfbf1c4948d555a9ebca7673c0eb4a SHA256 6bdd690cf542c5e4a796bdb2173284fefc1b8a429e162c5b2e7aee09cd1df558 -AUX root-5.26.00e-make-3.82.patch 1638 RMD160 9c29d5b32a65f181ffd10964113e290b70d20130 SHA1 2ada31318bc631b4442a1a79a4644a8de5c86b9c SHA256 0c94fc3f8bb8eb009465913f2ee20eefc510468643c04d2aad8cc40341fde457 -AUX root-5.26.00e-nobyte-compile.patch 7102 RMD160 b9de8346df9997507193388d64e36992981e26b2 SHA1 941facff70bfcb762a1208c3c187887b4b640464 SHA256 052dc6b4b879eca62ce7f72c9fd81f66039e45cff3df023a64062e8fcb2c2985 -AUX root-5.26.00e-prop-ldflags.patch 453 RMD160 c5e1448df77c6d850e944717edb9260810731622 SHA1 e69717df174b769a97722a4b4d3bfc9454a13180 SHA256 5e4d58d0b5b761745beb34e901e45805b1f6d0d832235fa8b2f2c3bce39046be -AUX root-5.26.00e-xrootd-prop-flags.patch 35220 RMD160 00ed6eb85a5f234fd3e574cac065b0f3f8b9598a SHA1 9f93fb817e8523f2b4c2e35592f0c2d7470fdd97 SHA256 96f5aec8b82fcd016c37c4bc94865b6fcb8eb203384e61253c70a829b0f37df2 +AUX root-5.28.00-asneeded.patch 712 RMD160 0b3a3d41e309f13310fda607955ad88cc6bc176e SHA1 4fa704d2790e19933155da2587a9c6998d3c4e4f SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b +AUX root-5.28.00-configure-paths.patch 1041 RMD160 8422140f06d2387f286cec0b21d4accda0dc42f1 SHA1 0d87586041a30de74191bd0ffdd10da9be8419ad SHA256 8737525bbb3e82abf8217a038477fb149c424ae895caa0c8e08816963dc65da7 +AUX root-5.28.00-glibc212.patch 276 RMD160 02901df4c8e5e3c7d50a78916f843fde83faf1f0 SHA1 842129d6247255b5fa72778a12f08e1383247cd8 SHA256 e51e127a80e2bf1afad41c2b7ca5233c362bce017057ca489bedb2a9442efb62 +AUX root-5.28.00-nobyte-compile.patch 5483 RMD160 490801842ba9ca6c980e498224d48dc676fcf0fa SHA1 538ac62083b8b12c558b97d72235dd047a64b632 SHA256 81b015dd6c122176fbc3103c75f62b7b1c3db569ad6d461ca544248f4e017b5c +AUX root-5.28.00-prop-ldflags.patch 433 RMD160 fd1717af9210471d7de0f06a47011e03d3f76d9a SHA1 b5dac8b013219dcfe577f2972fcc1d548f153cc3 SHA256 04f4b65a91e28386c7a857fe361f091943f4bb6fc82a9473ac7605412c199191 +AUX root-5.28.00-unuran.patch 1531 RMD160 8083784cc831fc304f2e94fdf3b8aa8379d0bd9a SHA1 5c4537ba1922775fb63d65340a18a3c2b1d2311b SHA256 09458c60c9d38af2d204939f752ec25364d04cf66810b7cae5e88368f84c31c8 +AUX root-5.28.00-xrootd-prop-flags.patch 31526 RMD160 c8d856d125f8fbd27a8c1687f42cfbd554ff9c79 SHA1 997729f24125834ed31d0c9431c841638b4c7ed8 SHA256 ad7808fc4a507e172a072d6b96c81cc5fba802c331c0362b74198c8087092745 AUX rootd.confd 199 RMD160 9ca9864292e7301d3feb6c36d88ba16002b7d7fa SHA1 822983a24e219bd860124f363a1e4250a17026dd SHA256 7b69f646ce0b2546ce797ec4a05949b02302dc5f4e41d2e8896ed0bc6575ac8d AUX rootd.initd 732 RMD160 80360c717b4d189c95a056e29f9d27165893d6f9 SHA1 6d6feb0d8940e2cea3c45d999da954c6a1cf4e45 SHA256 1151b01a9cdaa63a10fcf2d511d15ffc7e71bc53d5394774d0f619bab24d1486 AUX xrootd.confd 200 RMD160 2344c73ca3c27adeb70b092850cfd292af7d58bd SHA1 f2b895f43d3537e8614a907c7c94642f01c084e4 SHA256 03c1191168ddea3bc6621e26eb56e509e6c9a4d58756ffbbd07ff6657200e57d AUX xrootd.initd 720 RMD160 adf1a1c2d49654eb2061be8c7d0256d4e6602072 SHA1 85f9ad2119d923abbce9cd96420f4f851a7bb8e4 SHA256 80a24f12e8f2b2b7549c7668fba1af371f471f58e16d1277030e8b46e863bd8a DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c6e54eaa419fb SHA1 f176782746542b00ff60320b4a41e1218db3d006 SHA256 101c4e4c41962238fcabf1caa86cafc51241a1800594491b2e62ef8b565a5646 -DIST TMVAUsersGuide-v4.pdf 2355827 RMD160 0624a6ed7e006581eacdaa69e82bbdca91aa42a9 SHA1 98016f0ccfa6c54234e22b46032bb0b2f5d7ac20 SHA256 bbc6563fd14a6a4a88efca55fa75e74d9b5c2a9f5d3044239f3f83dc2967ad62 +DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af DIST Users_Guide_5_26.pdf 11197843 RMD160 0560efd109ee45148d4918eecba76736b583ea00 SHA1 3da4ea7e463825a20514deeb7e3b392b32b08178 SHA256 9d19277da5ac6b20e825a8d1d000dc90c595e1c042e5caca9ffb3271a6347bfe -DIST root_v5.26.00e.source.tar.gz 28922785 RMD160 692312a1984279255e32c96a0a79b974ff2e2971 SHA1 5a4b7e1b759dfef0dd218491bbe74ca376fc8c07 SHA256 7f2604954775653825b9897da131278c9b349f12d77b1fc087004c1b838f4a80 -EBUILD root-5.26.00e.ebuild 9291 RMD160 0592f1d5b2a7c0c2e8aa28ed8c3c85e67699e0b1 SHA1 8aa4227619820fdb080b2de0af734a497709fe50 SHA256 8575e4b3b88dc9618c6f496497fe528234aaf392fb21e2da68483b5cfdba51fb -MISC ChangeLog 21905 RMD160 6e96285e707c76252972be9cd675a961ebc1cbec SHA1 6bc2c8c2a50417d4bf019db5e2941181986f8584 SHA256 11e275137c23a292a3a300751864c53969b8c61654daed40f29e6de672d4abba -MISC metadata.xml 1447 RMD160 ea9e4cda86f83ddbdcfa63667cc0566353d4c118 SHA1 53be10972173afad6271890c02f386fa17c59b92 SHA256 450c6183f001eed437f8097f22caa92d814ddc05855e8166cf656279706af8c5 +DIST root_v5.28.00.source.tar.gz 30213091 RMD160 3a6166be640011330dac31b43072f5d4c6bebcfa SHA1 3ccb18294ce0cd73ba1617182699df75111095eb SHA256 7eb4938770871cda582c54fcbe55aa6995c98a2b0618652159a1e87b09ba7bec +EBUILD root-5.28.00.ebuild 9705 RMD160 2a7144fed597c900c81a089c567be2c66989fe20 SHA1 db217f4d7aebf1e3e1f0736f599e5cb1137eeeb0 SHA256 ee4ec2ddf3c33edfc907b00cda1a2b2e618770d967699ae5d715b1bb42764c8f +MISC ChangeLog 22871 RMD160 1d9e28033fe1cea229c792577499ce20defc291f SHA1 fcfcf91ce8103f81fde58eacb6c611e11b26db1d SHA256 f8fa1d28d6805577e83797cab85686b803fb3c181e88380f710ff0b3cf456cf8 +MISC metadata.xml 1624 RMD160 11aee558dfde68d67ad7ea85b786f8b2cffc4a98 SHA1 52aa8435837283ea5eadca1d1469b14d00f118c6 SHA256 2648938cf2ffcab17675d38a187d4b6653d2ca02b65ae901b94d24abca5ff6f4 diff --git a/sci-physics/root/files/root-5.26.00e-make-3.82.patch b/sci-physics/root/files/root-5.26.00e-make-3.82.patch deleted file mode 100644 index dc6d8a018..000000000 --- a/sci-physics/root/files/root-5.26.00e-make-3.82.patch +++ /dev/null @@ -1,36 +0,0 @@ -http://root.cern.ch/viewcvs?view=rev&revision=35096 -https://savannah.cern.ch/bugs/?func=detailitem&item_id=72166 - ---- root-5.26.00d/Makefile -+++ root-5.26.00d/Makefile -@@ -544,6 +544,30 @@ - .PRECIOUS: include/%.h - - # special rules (need to be defined before generic ones) -+cint/cint/lib/dll_stl/G__%.o: cint/cint/lib/dll_stl/G__%.cxx -+ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ -+ $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ -+ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< -+ $(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< -+ -+cint/cint/lib/dll_stl/G__c_%.o: cint/cint/lib/dll_stl/G__c_%.c -+ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ -+ $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \ -+ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< -+ $(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< -+ -+cint/cint/lib/G__%.o: cint/cint/lib/G__%.cxx -+ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ -+ $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ -+ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< -+ $(CXX) $(NOOPT) $(CXXFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< -+ -+cint/cint/lib/G__c_%.o: cint/cint/lib/G__c_%.c -+ $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ -+ $(CFLAGS) $(DICTFLAGS) -I$(CINTDIR)/lib/prec_stl \ -+ -I$(CINTDIR)/stl -I$(CINTDIR)/inc -- $< -+ $(CC) $(NOOPT) $(CFLAGS) $(DICTFLAGS) -I. -I$(CINTDIR)/inc $(CXXOUT)$@ -c $< -+ - G__%.o: G__%.cxx - $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- \ - $(CXXFLAGS) $(DICTFLAGS) -D__cplusplus -I$(CINTDIR)/lib/prec_stl \ diff --git a/sci-physics/root/files/root-5.26.00e-prop-ldflags.patch b/sci-physics/root/files/root-5.26.00e-prop-ldflags.patch deleted file mode 100644 index 322c3bd67..000000000 --- a/sci-physics/root/files/root-5.26.00e-prop-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur root.orig/config/Makefile.in root/config/Makefile.in ---- root.orig/config/Makefile.in 2010-10-13 23:43:25.000000000 +0100 -+++ root/config/Makefile.in 2010-10-13 23:48:57.000000000 +0100 -@@ -9,7 +9,7 @@ - - EXTRA_CFLAGS := -Iinclude @cflags@ - EXTRA_CXXFLAGS := -Iinclude @cflags@ --EXTRA_LDFLAGS := @ldflags@ -+EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) - WINRTDEBUG := @winrtdebug@ - ENABLEPCH := @enable_pch@ - NOSTUBS := @no_stubs@ diff --git a/sci-physics/root/files/root-5.26.00e-xrootd-prop-flags.patch b/sci-physics/root/files/root-5.26.00e-xrootd-prop-flags.patch deleted file mode 100644 index 48851fdc0..000000000 --- a/sci-physics/root/files/root-5.26.00e-xrootd-prop-flags.patch +++ /dev/null @@ -1,684 +0,0 @@ -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in root/net/xrootd/src/xrootd/config/GNUmake.options.in ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.options.in 2010-10-13 23:49:52.000000000 +0100 -@@ -16,7 +16,7 @@ - CF32="$(TYPECF32)" \ - CFOP="$(@buildopt@)" \ - LD="$(TYPELD)" \ --LDOP="$(@buildopt@)" \ -+LDOP="$(LDFLAGS)" \ - LDSO="$(TYPELDSO)" \ - LIBS=" @ldsyslibs@ $(TYPELIBS)" \ - LIBM="$(TYPELIBSM)" \ -@@ -34,7 +34,7 @@ - CF32="$(TYPECF32)" \ - CFOP="$(@buildopt@)" \ - LD="$(TYPELD)" \ --LDOP="$(@buildopt@)" \ -+LDOP="$(LDFLAGS)" \ - LDSO="$(TYPELDSO)" \ - LIBS=" @ldsyslibs@ $(TYPELIBS)" \ - LIBM="$(TYPELIBSM)" \ -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2010-10-13 23:49:52.000000000 +0100 -@@ -11,7 +11,7 @@ - -Wall -Wno-deprecated $(CFTRACE) - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - TYPELDSO = -shared - TYPESHLIB = so -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2010-10-13 23:49:52.000000000 +0100 -@@ -11,7 +11,7 @@ - -Wall -Wno-deprecated -D__linux__ $(CFTRACE) - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - TYPELDSO = -m32 -shared - TYPESHLIB = so -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2010-10-13 23:49:52.000000000 +0100 -@@ -11,7 +11,7 @@ - -Wall -Wno-deprecated -D__linux__ $(CFTRACE) - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - TYPELDSO = -shared - TYPESHLIB = so -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2010-10-13 23:49:52.000000000 +0100 -@@ -11,7 +11,7 @@ - -Wall -Wno-deprecated -D__linux__ $(CFTRACE) - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - TYPELDSO = -m64 -shared - TYPESHLIB = so -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc root/net/xrootd/src/xrootd/config/GNUmake.rules.icc ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2010-10-13 23:49:52.000000000 +0100 -@@ -13,7 +13,7 @@ - -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE) - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - TYPELDSO = -m32 -shared - TYPESHLIB = so -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2010-10-13 23:49:52.000000000 +0100 -@@ -14,7 +14,7 @@ - -wd1572 -wd584 -i-dynamic $(CFTRACE) - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - TYPELDSO = -m64 -shared - TYPESHLIB = so -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos root/net/xrootd/src/xrootd/config/GNUmake.rules.macos ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2010-10-13 23:49:52.000000000 +0100 -@@ -18,7 +18,7 @@ - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - TYPELINK = -undefined dynamic_lookup -multiply_defined suppress --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - ifeq ($(subst $(MACOSX_MINOR),,1234),1234) - TYPELDSO = $(TYPELINK) -dynamiclib -single_module -m32 -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2010-10-13 23:49:52.000000000 +0100 -@@ -15,7 +15,7 @@ - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - TYPELINK = -undefined dynamic_lookup -multiply_defined suppress --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - ifeq ($(subst $(MACOSX_MINOR),,1234),1234) - TYPELDSO = $(TYPELINK) -dynamiclib -single_module -m64 -diff -Nur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc ---- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2010-10-13 23:49:52.000000000 +0100 -@@ -11,7 +11,7 @@ - -Wall -Wno-deprecated -DSUNGCC $(CFTRACE) - TYPECF32 = - TYPECF64 = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --TYPEOPT = $(TYPEMISC) -O2 -+TYPEOPT = $(TYPEMISC) $(CXXFLAGS) - TYPEDBG = $(TYPEMISC) -g - TYPELDSO = -shared - TYPESHLIB = so -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -79,7 +79,7 @@ - - $(TESTBIN): $(OBJECTB) $(LIBDEPS) - @echo Creating executable $(TESTBIN) -- $(ECHO)$(LD) $(CFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) - - $(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc XrdAccAccess.hh \ - XrdAccCapability.hh XrdAccConfig.hh XrdAccGroups.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -49,7 +49,7 @@ - - $(XRDADLER32): $(XRDADLER32_OBJ) - @echo Creating executable $(XRDADLER32) -- $(ECHO)$(LD) $(LDOP) $(XRDADLER32_OBJ) $(BINLIBS) $(XRDADLERLIBS) -o $(XRDADLER32) -+ $(ECHO)$(LD) $(LDFLAGS) $(XRDADLER32_OBJ) $(BINLIBS) $(XRDADLERLIBS) -o $(XRDADLER32) - - $(XRDADLER32_OBJ): Xrdadler32.cc \ - XrdPosixExtern.hh XrdPosixXrootd.hh \ -@@ -62,7 +62,7 @@ - - $(XRDMPXBIN): $(XRDMPXOBJ) - @echo Creating executable $(XRDMPXBIN) -- $(ECHO)$(LD) $(LDOP) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN) -+ $(ECHO)$(LD) $(LDFLAGS) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN) - - $(XRDMPXOBJ): XrdMpxStats.cc \ - XrdNetDNS.hh XrdNetSocket.hh XrdNetOpts.hh \ -@@ -74,7 +74,7 @@ - - $(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS) - @echo Creating executable $(XRDW41) -- $(ECHO)$(LD) $(LDOP) $(XRDW41_OBJ) $(BINLIBS) $(XRDW41LIBS) -o $(XRDW41) -+ $(ECHO)$(LD) $(LDFLAGS) $(XRDW41_OBJ) $(BINLIBS) $(XRDW41LIBS) -o $(XRDW41) - - $(XRDW41_OBJ): XrdWait41.cc \ - XrdOucTList.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -74,7 +74,7 @@ - ranlib $(LIBARCH); \ - fi - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) - - $(OBJDIR)/XrdBwm.o: XrdBwm.cc XrdBwm.hh \ - XrdAccAuthorize.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -166,17 +166,17 @@ - $(LIBSHARED): $(OBJECTS) $(LIBDEP) - @echo Creating shared library $(LIBSHARED) - $(ECHO)rm -f $(LIBSHARED) -- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED) - ifneq ($(subst $(MACOSX_MINOR),,1234),1234) - $(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \ -- $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \ -+ $(LD) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \ - fi - endif - - $(LIBRARY_JNI): $(OBJECT_JNI) - @echo Creating shared library $(LIBRARY_JNI) - $(ECHO)rm -f $(LIBRARY_JNI); -- $(ECHO)$(CC) $(CFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI) - - $(CLASS_JNI_TARGET): $(CLASS_JNI).java - @echo Creating JNI class file $(CLASS_JNI_TARGET) -@@ -184,27 +184,27 @@ - - $(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS) - @echo Creating executable $(BINDIR)/TestXrdClient_read -- $(ECHO)$(LD) $(LDOP) $(OBJECTD) $(BINLIBS) $(LIBM) $(LIBS) -o $(BINDIR)/TestXrdClient_read -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTD) $(BINLIBS) $(LIBM) $(LIBS) -o $(BINDIR)/TestXrdClient_read - - $(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS) - @echo Creating executable $(BINDIR)/TestXrdClient -- $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBM) $(LIBS) -o $(BINDIR)/TestXrdClient -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBM) $(LIBS) -o $(BINDIR)/TestXrdClient - - $(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS) - @echo Creating executable $(XRDCP) -- $(ECHO)$(LD) $(LDOP) $(OBJECTC) $(BINLIBS) $(LIBM) $(LIBS) $(LIBZ) -o $(XRDCP) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTC) $(BINLIBS) $(LIBM) $(LIBS) $(LIBZ) -o $(XRDCP) - - $(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS) - @echo Creating executable $(XRDPREPTOOL) -- $(ECHO)$(LD) $(LDOP) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDPREPTOOL) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDPREPTOOL) - - $(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS) - @echo Creating executable $(XRDSTAGETOOL) -- $(ECHO)$(LD) $(LDOP) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDSTAGETOOL) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBM) $(LIBS) -o $(XRDSTAGETOOL) - - $(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS) - @echo Creating executable $(XRDCLI) -- $(ECHO)$(LD) $(LDOP) $(OBJECT_CLI) $(BINLIBS) $(LIBM) $(LIBS) $(LIBREADLINE) -o $(XRDCLI) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECT_CLI) $(BINLIBS) $(LIBM) $(LIBS) $(LIBREADLINE) -o $(XRDCLI) - - $(XRDADMIN): $(PERLMOD) - $(ECHO)if [ "$(PERLBIN)" != "" ]; then \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -136,7 +136,7 @@ - - $(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS) - @echo Creating executable $(BINARY) -- $(ECHO)$(LD) $(LDOP) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) - - - $(LIBRARY): $(OBJCLNT) $(OBJBOTH) -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -88,11 +88,11 @@ - - $(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP) - @echo Creating executable $(BINDIR)/XrdCnsd -- $(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd - - $(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP) - @echo Creating executable $(BINDIR)/cns_ssi -- $(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi - - $(OBJDIR)/XrdCnsConfig.o: XrdCnsConfig.hh XrdCnsConfig.cc \ - XrdCnsDaemon.hh XrdCnsLogRec.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -155,7 +155,7 @@ - - $(LIBRARY): $(OBJECTS) $(LIBUTIL) - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) $(TYPELIBS) - - $(LIBASSL): $(OBJCSSL) - @echo Creating archive $(LIBASSL) -@@ -165,11 +165,11 @@ - - $(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL) - @echo Creating shared library $(LIBCSSL) -- $(ECHO)$(LD) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL) - - $(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS) - @echo Creating executable $(CRYPTOTEST) -- $(ECHO)$(LD) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST) - - $(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \ - XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -119,19 +119,19 @@ - - $(BINADMIN): $(OBJLIB) $(OBJADMIN) $(OBJDEPS) - @echo Creating executable $(BINADMIN) -- $(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINADMIN) - - $(BINPSTGA): $(OBJLIB) $(OBJPSTG) $(OBJADDS) $(OBJDEPS) - @echo Creating executable $(BINPSTGA) -- $(ECHO)$(LD) $(LDOP) $(OBJPSTG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPSTGA) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJPSTG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPSTGA) - - $(BINPSTGD): $(OBJLIB) $(OBJPSTG) $(OBJADDS) $(OBJDEPS) - @echo Creating executable $(BINPSTGD) -- $(ECHO)$(LD) $(LDOP) $(OBJPSTG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPSTGD) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJPSTG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPSTGD) - - $(BINPURGD): $(OBJLIB) $(OBJPURG) $(OBJADDS) $(OBJDEPS) - @echo Creating executable $(BINPURGD) -- $(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJPURG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPURGD) - - $(OBJDIR)/XrdFrmAdmin.o: XrdFrmAdmin.hh XrdFrmAdmin.cc XrdFrmTrace.hh \ - XrdFrmConfig.hh XrdFrmUtils.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -160,27 +160,27 @@ - $(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \ - if [ "x$(SUNCACHE)" != "x" ]; then \ - $(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \ -- $(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys; \ -+ $(LD) $(LDFLAGS) lib_temp.a $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys; \ - rm lib_temp.a; \ - fi; \ - else \ -- $(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys; \ -+ $(LD) $(LDFLAGS) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys; \ - fi - $(DECODER): $(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \ - $(LIBRARY_COMMON) - @echo Creating executable $(@F) -- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -+ $(ECHO)$(LD) $(LDFLAGS) $(LIBS) -o $@ $^ - - $(SENDER): $(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) - @echo Creating executable $(@F) - $(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \ - if [ "x$(SUNCACHE)" != "x" ]; then \ - $(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \ -- $(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ - rm lib_temp.a; \ - fi; \ - else \ -- $(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \ - fi - - $(FSENDER): $(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) -@@ -188,11 +188,11 @@ - $(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \ - if [ "x$(SUNCACHE)" != "x" ]; then \ - $(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \ -- $(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ - rm lib_temp.a; \ - fi; \ - else \ -- $(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \ - fi - - $(ADMIN): $(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) -@@ -200,11 +200,11 @@ - $(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \ - if [ "x$(SUNCACHE)" != "x" ]; then \ - $(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \ -- $(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ - rm lib_temp.a; \ - fi; \ - else \ -- $(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \ - fi - - $(COUT2FILE): $(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) -@@ -212,35 +212,35 @@ - $(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \ - if [ "x$(SUNCACHE)" != "x" ]; then \ - $(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \ -- $(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ - rm lib_temp.a; \ - fi; \ - else \ -- $(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \ - fi - - $(DUMPPACKETS): $(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) - @echo Creating executable $(@F) -- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -+ $(ECHO)$(LD) $(LDFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ - - $(DEBUGPACKET): $(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) - @echo Creating executable $(@F) -- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -+ $(ECHO)$(LD) $(LDFLAGS) $(LIBS) -o $@ $^ - - $(CONVTIME): $(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) - @echo Creating executable $(@F) -- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -+ $(ECHO)$(LD) $(LDFLAGS) $(LIBS) -o $@ $^ - - $(TESTPARSER): $(OBJECTS_BIN_TPR) $(LIBRARY_COMMON) - @echo Creating executable $(@F) - $(ECHO)if [ "$(TYPE)" = "SunOS" -a "$(CC)" = "CC" ]; then \ - if [ "x$(SUNCACHE)" != "x" ]; then \ - $(CC) -xar -o lib_temp.a $(OBJDIR)$(SUNCACHE)/*/*.o; \ -- $(CC) $(CFLAGS) $(LDOP) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) lib_temp.a $(LIBS) -lresolv -o $@ $^; \ - rm lib_temp.a; \ - fi; \ - else \ -- $(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^; \ -+ $(LD) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^; \ - fi - - $(OBJDIR)/%.o : %.cc -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdOdc/GNUmakefile root/net/xrootd/src/xrootd/src/XrdOdc/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdOdc/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdOdc/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -79,7 +79,7 @@ - - $(TESTBIN): $(OBJECTB) $(LIBDEPS) - @echo Creating executable $(TESTBIN) -- $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) - - $(OBJDIR)/XrdOdcConfig.o: XrdOdcConfig.hh XrdOdcMsg.hh XrdOdcTrace.hh \ - XrdOuca2x.hh XrdOucStream.hh XrdOucTList.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdOfs/GNUmakefile root/net/xrootd/src/xrootd/src/XrdOfs/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdOfs/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdOfs/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -84,7 +84,7 @@ - ranlib $(LIBARCH); \ - fi - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) - - $(OBJDIR)/XrdOfs.o: XrdOfs.cc XrdOfs.hh \ - XrdOfsHandle.hh XrdOfsEvs.hh XrdOfsStats.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdOlb/GNUmakefile root/net/xrootd/src/xrootd/src/XrdOlb/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdOlb/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdOlb/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -82,7 +82,7 @@ - - $(BINARY): $(OBJECTS) $(LIBDEPS) - @echo Creating executable $(BINARY) -- $(ECHO)$(LD) $(LDOP) $(OBJECTS) $(BINLIBS) $(LIBS) -o $(BINARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(BINLIBS) $(LIBS) -o $(BINARY) - - $(OBJDIR)/XrdOlbAdmin.o: XrdOlbAdmin.hh XrdOlbAdmin.cc \ - XrdNetSocket.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -83,14 +83,14 @@ - - $(LIBPLDR): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP) - @echo Creating shared library $(LIBPLDR) -- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR) - - $(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP) - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) - ifneq ($(subst $(MACOSX_MINOR),,1234),1234) - $(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \ -- $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \ -+ $(LD) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \ - fi - endif - # MacOS X does not support linking against shared libraries so include -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -65,7 +65,7 @@ - - $(TARGETS): $(OBJECTS) $(OBJECTT) $(LIBDEP) - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) - - $(OBJDIR)/XrdPss.o: XrdPss.cc XrdPss.hh XrdPosixXrootd.hh \ - XrdOss.hh XrdOssError.hh XrdOucEnv.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -6,7 +6,7 @@ - - include ../GNUmake.env - --LFLAGS = -L$(LIBDIR) -lXrdOuc $(LDSO) -+LFLAGS = $(LDSO) -L$(LIBDIR) -lXrdOuc - - LIBDEPS = $(LIBDIR)/libXrdOuc.a - -@@ -48,7 +48,7 @@ - - $(TARGETS): $(OBJECTS) $(LIBDEPS) - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(OBJECTS) $(LFLAGS) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LFLAGS) -o $(LIBRARY) - - $(OBJDIR)/XrdRootdProtocol.o: XrdRootdProtocol.hh XrdLink.hh \ - XrdScheduler.hh XrdTrace.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -85,15 +85,15 @@ - - $(LIBRARY): $(OBJSLIB) $(LIBDEPS) - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY); -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY); - - $(TSTBINA): $(OBJECTA) $(LIBDEPS) - @echo Creating executable $(TSTBINA) -- $(ECHO)$(LD) $(LDOP) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA) - - $(TSTBINB): $(OBJECTB) $(LIBDEPS) - @echo Creating executable $(TSTBINB) -- $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB) - - $(OBJDIR)/XrdSecClient.o: XrdSysPthread.hh XrdSecPManager.hh XrdSecInterface.hh \ - XrdOucErrInfo.hh XrdSecClient.cc XrdSecEntity.hh -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -114,19 +114,19 @@ - - $(LIBRARY): $(OBJECTS) $(LIBDEPS) - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(LD) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY) - - $(LIBLDAP): $(OBJECTC) - @echo Creating shared library $(LIBLDAP) -- $(ECHO)$(LD) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBLDAP) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBLDAP) - - $(SECGSITEST): $(OBJECTA) $(LIBDEPS) - @echo Creating executable $(SECGSITEST) -- $(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST) - - $(SECGSIPROXY): $(OBJECTB) $(LIBDEPS) - @echo Creating executable $(SECGSIPROXY) -- $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY) - - $(OBJDIR)/XrdSecgsitest.o: XrdSecgsitest.cc XrdOucString.hh \ - XrdSysError.hh XrdSutAux.hh XProtocol.hh XPtypes.hh XrdCryptoAux.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -45,7 +45,7 @@ - - $(TARGETS): $(OBJECTS) $(LIBDEPS) - @echo Creating shared library $(TARGETS) -- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); - - $(OBJDIR)/XrdSecProtocolkrb4.o: XrdSecProtocolkrb4.cc XrdSecInterface.hh \ - XrdSysPthread.hh XrdOucTokenizer.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -47,7 +47,7 @@ - - $(TARGETS): $(OBJECTS) $(LIBDEPS) - @echo Creating shared library $(TARGETS) -- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); - - $(OBJDIR)/XrdSecProtocolkrb5.o: XrdSecProtocolkrb5.cc XrdSecInterface.hh \ - XrdSysPthread.hh XrdOucTokenizer.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -65,11 +65,11 @@ - - $(LIBRARY): $(OBJECTS) $(LIBDEPS) - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY) - - $(SRVADMIN): $(OBJECTA) $(LIBDEPS) - @echo Creating executable $(SRVADMIN) -- $(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(SRVADMIN) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(SRVADMIN) - - $(OBJDIR)/XrdSecpwdSrvAdmin.o: XrdSecpwdSrvAdmin.cc \ - XrdOucString.hh XrdSutAux.hh XProtocol.hh XPtypes.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -77,7 +77,7 @@ - - $(LIBRARY): $(OBJECTS) $(LIBDEPS) - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY); -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY); - - $(LIBGRST): $(OBJGRST) - @echo Creating archive $(LIBGRST) -@@ -95,7 +95,7 @@ - - $(SECSSLTEST): $(OBJECTA) $(LIBDEPS) - @echo Creating executable $(SECSSLTEST) -- $(ECHO)$(LD) $(LDOP) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST) - - $(OBJDIR)/XrdSecProtocolssl.o: XrdSecProtocolssl.cc XrdSecProtocolssl.hh XrdSecInterface.hh \ - XrdSysHeaders.hh XrdNetDNS.hh XrdOucErrInfo.hh XrdOucHash.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -69,11 +69,11 @@ - - $(TARGLIB): $(OBJSLIB) $(LIBDEPS) - @echo Creating shared library $(TARGLIB) -- $(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLIB); -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLIB); - - $(TARGBIN): $(OBJSBIN) - @echo Creating executable $(TARGBIN) -- $(ECHO)$(LD) $(LDOP) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN); -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN); - - $(OBJDIR)/XrdSecProtocolsss.o: XrdSecProtocolsss.cc XrdSecProtocolsss.hh \ - XrdNetDNS.hh XrdOucErrInfo.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -45,7 +45,7 @@ - - $(TARGETS): $(OBJECTS) $(LIBDEPS) - @echo Creating shared library $(TARGETS) -- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); - - $(OBJDIR)/XrdSecProtocolunix.o: XrdSecProtocolunix.cc XrdSecInterface.hh \ - XrdSysHeaders.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -75,7 +75,7 @@ - - $(LIBRARY): $(OBJECTS) $(LIBDIR)/libXrdOuc.a - @echo Creating shared library $(LIBRARY) -- $(ECHO)$(CC) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY) -+ $(ECHO)$(LD) $(LDFLAGS) $(LDSO) $(OBJECTS) $(LIBDIR)/libXrdOuc.a -o $(LIBRARY) - - $(OBJDIR)/XrdSutPFAdmin.o: XrdSutPFAdmin.cc XrdOucString.hh \ - XrdSutAux.hh XProtocol.hh XPtypes.hh \ -diff -Nur root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile ---- root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile 2010-10-13 23:49:52.000000000 +0100 -@@ -85,7 +85,7 @@ - - $(TARGETS): $(OBJECTS) $(OBJDEPS) - @echo Creating executable $(TARGETS) -- $(ECHO)$(LD) $(LDOP) $(OBJECTS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS) -+ $(ECHO)$(LD) $(LDFLAGS) $(OBJECTS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS) - - $(OBJDIR)/XrdXrootdAdmin.o: XrdXrootdAdmin.hh XrdXrootdAdmin.cc \ - XrdXrootdTrace.hh XrdXrootdProtocol.hh \ diff --git a/sci-physics/root/files/root-5.28.00-asneeded.patch b/sci-physics/root/files/root-5.28.00-asneeded.patch new file mode 100644 index 000000000..b845247e1 --- /dev/null +++ b/sci-physics/root/files/root-5.28.00-asneeded.patch @@ -0,0 +1,20 @@ +--- root.orig/configure 2010-12-20 07:17:54.000000000 +0000 ++++ root/configure 2010-12-20 07:16:05.000000000 +0000 +@@ -709,7 +709,7 @@ + cat <<EOF > conftest.mk + include ${ac_srcdir}/config/Makefile.${arch} + conftest: conftest.c +- \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ ++ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ + + conftest.c: + echo "int main() { return 0; }" > \$@ +@@ -723,7 +723,7 @@ + cat <<EOF > conftest.mk + include ${ac_srcdir}/config/Makefile.${arch} + conftest:conftest.c +- \$(CC) \$(CFLAGS) \$(LDFLAGS) $linkdir $linklib \$< -o \$@ ++ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $linkdir $linklib -o \$@ + + conftest.c: + echo "extern int $linksymbol (); " > \$@ diff --git a/sci-physics/root/files/root-5.26.00e-configure-paths.patch b/sci-physics/root/files/root-5.28.00-configure-paths.patch index 06d19ccd5..e2bc30ca4 100644 --- a/sci-physics/root/files/root-5.26.00e-configure-paths.patch +++ b/sci-physics/root/files/root-5.28.00-configure-paths.patch @@ -1,15 +1,6 @@ ---- root.orig/configure 2010-10-13 23:43:25.000000000 +0100 -+++ root/configure 2010-10-13 23:43:58.000000000 +0100 -@@ -728,7 +728,7 @@ - cat <<EOF > conftest.mk - include config/Makefile.${arch} - conftest:conftest.c $symbolfile -- \$(CC) \$(CFLAGS) \$(LDFLAGS) $symbolfile \$< -o \$@ -+ \$(CC) \$(CFLAGS) \$(LDFLAGS) \$< $symbolfile -o \$@ - - conftest.c: - echo "extern int $symbol (); " > \$@ -@@ -2255,8 +2255,8 @@ +--- root.orig/configure 2010-12-17 22:34:50.987000643 +0300 ++++ root/configure 2010-12-17 22:35:55.046516404 +0300 +@@ -2703,8 +2703,8 @@ if test ! "x$enable_pgsql" = "xno"; then # Check for PgSQL include and library check_header "libpq-fe.h" "$pgsqlincdir" $PGSQL $PGSQL/include \ @@ -20,7 +11,7 @@ /usr/include/postgresql/8.0 /usr/pgsql/include \ /usr/local/include/pgsql /usr/local/include/postgresql \ /usr/include/postgresql/8.0 /usr/pgsql /usr/local/pgsql \ -@@ -2338,7 +2338,7 @@ +@@ -2786,7 +2786,7 @@ else check_header "sqlext.h" "$odbcincdir" \ $ODBC $ODBC/include $ODBCINCDIR /usr/local/include \ @@ -29,3 +20,4 @@ odbcinc=$found_hdr odbcincdir=$found_dir + diff --git a/sci-physics/root/files/root-5.26.00e-glibc212.patch b/sci-physics/root/files/root-5.28.00-glibc212.patch index 9c17becf4..a36543139 100644 --- a/sci-physics/root/files/root-5.26.00e-glibc212.patch +++ b/sci-physics/root/files/root-5.28.00-glibc212.patch @@ -1,4 +1,4 @@ ---- root/net/auth/src/TAFS.cxx.orig 2010-09-14 03:22:22.647915854 +0400 +--- root.orig/net/auth/src/TAFS.cxx 2010-09-14 03:22:22.647915854 +0400 +++ root/net/auth/src/TAFS.cxx 2010-09-14 03:22:39.034599899 +0400 @@ -11,6 +11,7 @@ @@ -8,3 +8,4 @@ #else # define ssize_t int # include <io.h> + diff --git a/sci-physics/root/files/root-5.26.00e-nobyte-compile.patch b/sci-physics/root/files/root-5.28.00-nobyte-compile.patch index 502623ed9..7029bf169 100644 --- a/sci-physics/root/files/root-5.26.00e-nobyte-compile.patch +++ b/sci-physics/root/files/root-5.28.00-nobyte-compile.patch @@ -1,6 +1,21 @@ -diff -Nur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk ---- root.orig/bindings/pyroot/Module.mk 2010-10-13 23:43:25.000000000 +0100 -+++ root/bindings/pyroot/Module.mk 2010-10-13 23:47:08.000000000 +0100 +diff -Naur root.orig/Makefile root/Makefile +--- root.orig/Makefile 2010-12-17 22:48:40.577775091 +0300 ++++ root/Makefile 2010-12-17 22:49:27.902497903 +0300 +@@ -1148,10 +1148,7 @@ + if test "x$(RFLX_GRFLXPY)" != "x"; then \ + rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ + fi; \ +- if test "x$(RFLX_GRFLXPYC)" != "x"; then \ +- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ +- fi; \ +- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ ++ if test "x$(RFLX_GRFLXPY)" != "x"; then \ + dir=$(RFLX_GRFLXDD:lib/=); \ + while test "x$${dir}" != "x" && \ + test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ +diff -Naur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk +--- root.orig/bindings/pyroot/Module.mk 2010-12-17 22:48:39.941179413 +0300 ++++ root/bindings/pyroot/Module.mk 2010-12-17 22:49:27.899164943 +0300 @@ -48,8 +48,6 @@ ROOTPY := $(subst $(MODDIR),$(LPATH),$(ROOTPYS)) $(LPATH)/%.py: $(MODDIR)/%.py; cp $< $@ @@ -22,7 +37,7 @@ diff -Nur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk $(ROOTLIBSDEP) $(PYTHONLIBDEP) @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ "$(SOFLAGS)" libPyROOT.$(SOEXT) $@ \ -@@ -112,7 +108,7 @@ +@@ -113,7 +109,7 @@ distclean-$(MODNAME): clean-$(MODNAME) @rm -f $(PYROOTDEP) $(PYROOTDS) $(PYROOTDH) $(PYROOTLIB) \ @@ -31,10 +46,10 @@ diff -Nur root.orig/bindings/pyroot/Module.mk root/bindings/pyroot/Module.mk $(PYROOTPYD) $(PYTHON64DEP) $(PYTHON64) distclean:: distclean-$(MODNAME) -diff -Nur root.orig/build/package/debian/rules root/build/package/debian/rules ---- root.orig/build/package/debian/rules 2010-10-13 23:43:25.000000000 +0100 -+++ root/build/package/debian/rules 2010-10-13 23:47:08.000000000 +0100 -@@ -624,10 +624,6 @@ +diff -Naur root.orig/build/package/debian/rules root/build/package/debian/rules +--- root.orig/build/package/debian/rules 2010-12-17 22:48:40.197817461 +0300 ++++ root/build/package/debian/rules 2010-12-17 22:49:27.902497903 +0300 +@@ -623,10 +623,6 @@ -X$(SYSCONFDIR)/root/system.rootauthrc \ -X$(SYSCONFDIR)/root/system.rootdaemonrc \ -X$(PREFIX)/lib/root/$(SOVERS)/libAfterImage.a \ @@ -45,9 +60,9 @@ diff -Nur root.orig/build/package/debian/rules root/build/package/debian/rules # $(foreach i, \ # $(wildcard $(DTMP)/$(PREFIX)/lib/root/lib*.so.$(SOVERS)), \ # -X$(i:$(DTMP)/%=%) ) -diff -Nur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk ---- root.orig/cint/cintex/Module.mk 2010-10-13 23:43:25.000000000 +0100 -+++ root/cint/cintex/Module.mk 2010-10-13 23:47:08.000000000 +0100 +diff -Naur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk +--- root.orig/cint/cintex/Module.mk 2010-12-17 22:48:40.057833071 +0300 ++++ root/cint/cintex/Module.mk 2010-12-17 22:49:27.902497903 +0300 @@ -31,10 +31,6 @@ CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ @@ -68,46 +83,9 @@ diff -Nur root.orig/cint/cintex/Module.mk root/cint/cintex/Module.mk $(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) -diff -Nur root.orig/cint/cintexcompat/Module.mk root/cint/cintexcompat/Module.mk ---- root.orig/cint/cintexcompat/Module.mk 2010-10-13 23:43:25.000000000 +0100 -+++ root/cint/cintexcompat/Module.mk 2010-10-13 23:47:08.000000000 +0100 -@@ -31,10 +31,6 @@ - CINTEXPY := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS)) - $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@ - endif --ifneq ($(BUILDPYTHON),no) --CINTEXPYC := $(CINTEXPY:.py=.pyc) --CINTEXPYO := $(CINTEXPY:.py=.pyo) --endif - - # used in the main Makefile - ALLHDRS += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH)) -@@ -86,12 +82,10 @@ - fi) - cp $< $@ - --%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )' --%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )' - - ifeq ($(findstring $(MAKECMDGOALS),distclean maintainer-clean),) - # Avoid conflict with cintex/Module.mk --$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \ -+$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) \ - $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP) - @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ - "$(SOFLAGS)" libCintex.$(SOEXT) $@ "$(CINTEXO)" \ -@@ -113,7 +107,7 @@ - clean:: clean-$(MODNAME) - - distclean-$(MODNAME): clean-$(MODNAME) -- @rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) -+ @rm -f $(CINTEXDEP) $(CINTEXLIB) $(CINTEXMAP) $(CINTEXPY) - @rm -rf include/Cintex - - distclean:: distclean-$(MODNAME) -diff -Nur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk ---- root.orig/cint/reflex/Module.mk 2010-10-13 23:43:25.000000000 +0100 -+++ root/cint/reflex/Module.mk 2010-10-13 23:47:08.000000000 +0100 +diff -Naur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk +--- root.orig/cint/reflex/Module.mk 2010-12-17 22:48:40.037835301 +0300 ++++ root/cint/reflex/Module.mk 2010-12-17 22:51:36.871451359 +0300 @@ -48,9 +48,6 @@ RFLX_GRFLXS := $(wildcard $(RFLX_GRFLXSD)/*.py) RFLX_GRFLXPY := $(patsubst $(RFLX_GRFLXSD)/%.py,$(RFLX_GRFLXDD)/%.py,$(RFLX_GRFLXS)) @@ -118,16 +96,16 @@ diff -Nur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk RFLX_LIBDIR = $(LIBDIR) -@@ -97,7 +94,7 @@ - .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ - clean-check-$(MODNAME) check-$(MODNAME) clean-genreflex +@@ -92,7 +89,7 @@ + + ALLEXECS += $(RFLX_GENMAPX) --POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) -+POSTBIN += $(RFLX_GRFLXPY) +-POSTBIN += $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) ++POSTBIN += $(RFLX_GRFLXPY) - include/Reflex/%.h: $(REFLEXDIRI)/Reflex/%.h - @(if [ ! -d "include/Reflex" ]; then \ -@@ -123,8 +120,6 @@ + ##### local rules ##### + .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ +@@ -122,8 +119,6 @@ mkdir -p lib/python/genreflex; fi ) cp $< $@ @@ -137,7 +115,7 @@ diff -Nur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk $(RFLX_GENMAPO) : CXXFLAGS += -I$(REFLEXDIRS)/genmap @@ -149,7 +144,7 @@ - $(RLIBMAP) -o $(REFLEXDICTMAP) -l $(REFLEXDICTLIB) \ + $(RLIBMAP) -o $@ -l $(REFLEXDICTLIB) \ -d $(REFLEXDICTLIBDEPM) -c $(REFLEXL) -all-$(MODNAME): $(REFLEXLIB) $(REFLEXDICTLIB) $(REFLEXDICTMAP) $(RFLX_GRFLXPYC) $(RFLX_GRFLXPY) @@ -145,9 +123,9 @@ diff -Nur root.orig/cint/reflex/Module.mk root/cint/reflex/Module.mk clean-genreflex: @rm -rf lib/python/genreflex -diff -Nur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt ---- root.orig/cint/reflex/python/CMakeLists.txt 2010-10-13 23:43:25.000000000 +0100 -+++ root/cint/reflex/python/CMakeLists.txt 2010-10-13 23:47:08.000000000 +0100 +diff -Naur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CMakeLists.txt +--- root.orig/cint/reflex/python/CMakeLists.txt 2010-12-17 22:48:40.037835301 +0300 ++++ root/cint/reflex/python/CMakeLists.txt 2010-12-17 22:49:27.902497903 +0300 @@ -15,7 +15,7 @@ ##################### sources #################### @@ -157,18 +135,4 @@ diff -Nur root.orig/cint/reflex/python/CMakeLists.txt root/cint/reflex/python/CM ##################### gccxmlpath #################### -diff -Nur root.orig/Makefile root/Makefile ---- root.orig/Makefile 2010-10-13 23:43:25.000000000 +0100 -+++ root/Makefile 2010-10-13 23:47:08.000000000 +0100 -@@ -1082,10 +1082,7 @@ - if test "x$(RFLX_GRFLXPY)" != "x"; then \ - rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPY); \ - fi; \ -- if test "x$(RFLX_GRFLXPYC)" != "x"; then \ -- rm -f $(DESTDIR)$(LIBDIR)/$(RFLX_GRFLXPYC); \ -- fi; \ -- if test "x$(RFLX_GRFLXPY)$(RFLX_GRFLXPYC)" != "x"; then \ -+ if test "x$(RFLX_GRFLXPY)" != "x"; then \ - dir=$(RFLX_GRFLXDD:lib/=); \ - while test "x$${dir}" != "x" && \ - test -d $(DESTDIR)$(LIBDIR)/$${dir} && \ + diff --git a/sci-physics/root/files/root-5.28.00-prop-ldflags.patch b/sci-physics/root/files/root-5.28.00-prop-ldflags.patch new file mode 100644 index 000000000..732431943 --- /dev/null +++ b/sci-physics/root/files/root-5.28.00-prop-ldflags.patch @@ -0,0 +1,13 @@ +diff -Naur root.orig/config/Makefile.in root/config/Makefile.in +--- root.orig/config/Makefile.in 2010-12-14 17:20:26.000000000 +0300 ++++ root/config/Makefile.in 2010-12-17 22:33:34.902161458 +0300 +@@ -27,7 +27,7 @@ + + EXTRA_CFLAGS := -Iinclude @cflags@ + EXTRA_CXXFLAGS := -Iinclude @cflags@ +-EXTRA_LDFLAGS := @ldflags@ ++EXTRA_LDFLAGS := @ldflags@ $(LDFLAGS) + WINRTDEBUG := @winrtdebug@ + + GLBPATCHFLAGS := @glbpatchcflags@ + diff --git a/sci-physics/root/files/root-5.28.00-unuran.patch b/sci-physics/root/files/root-5.28.00-unuran.patch new file mode 100644 index 000000000..76422daed --- /dev/null +++ b/sci-physics/root/files/root-5.28.00-unuran.patch @@ -0,0 +1,39 @@ +diff -ur root-trunk.orig/math/unuran/Module.mk root-trunk/math/unuran/Module.mk +--- root.orig/math/unuran/Module.mk 2010-11-25 20:41:32.000000000 +0100 ++++ root/math/unuran/Module.mk 2010-11-25 20:51:47.190704977 +0100 +@@ -20,7 +20,7 @@ + UNURANETAG := $(call stripsrc,$(UNURANDIRS)/headers.d) + UNRCFG := $(call stripsrc,$(UNURANDIRS)/$(UNRVERS)/config.h) + +-UNRTARCONTENT:=$(subst $(UNRVERS),$(UNRDIRS),$(shell mkdir -p $(UNRDIR); cd $(UNRDIR); gunzip -c $(UNRSRCS) | tar tf -)) ++UNRTARCONTENT:= + UNRS := $(filter %.c, \ + $(filter $(UNRDIRS)/src/utils/%,$(UNRTARCONTENT)) \ + $(filter $(UNRDIRS)/src/methods/%,$(UNRTARCONTENT)) \ +@@ -69,10 +69,9 @@ + ##### local rules ##### + .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) + +-include/%.h: $(UNURANDIRI)/%.h $(UNURANETAG) ++include/%.h: $(UNURANDIRI)/%.h + cp $< $@ + +-$(UNURANDEP): $(UNRCFG) + $(UNRS): $(UNURANETAG) + + $(UNURANETAG): $(UNRSRCS) +@@ -125,12 +124,12 @@ + GNUMAKE=$(MAKE) ./configure CC="$$ACC" \ + CFLAGS="$$ACFLAGS"); + +-$(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) \ ++$(UNURANLIB): $(UNURANO) $(UNURANDO) $(ORDER_) \ + $(MAINLIBS) $(UNURANLIBDEP) + @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ + "$(SOFLAGS)" libUnuran.$(SOEXT) $@ \ + "$(UNURANO) $(UNURANDO)" \ +- "$(UNURANLIBEXTRA) $(UNRO)" ++ "$(UNURANLIBEXTRA) -lunuran" + + $(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP) + $(MAKEDIR) diff --git a/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch b/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch new file mode 100644 index 000000000..b6744165d --- /dev/null +++ b/sci-physics/root/files/root-5.28.00-xrootd-prop-flags.patch @@ -0,0 +1,605 @@ +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in root/net/xrootd/src/xrootd/config/GNUmake.env.in +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.env.in 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.env.in 2010-12-18 05:02:29.765122076 +0300 +@@ -45,6 +45,7 @@ + CFHASXRDCRYPTO = @hasxrdcrypto@ + + CFLAGS += $(CFSTRLCPY) $(CFHASOLDHDRS) $(CFFSTATAT) $(CFHASLIBZ) ++CFLAGS += $(CXXFLAGS) + + # AFS relevant variables + @incafs@ +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in root/net/xrootd/src/xrootd/config/GNUmake.options.in +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.options.in 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.options.in 2010-12-18 05:02:29.765122076 +0300 +@@ -16,7 +16,7 @@ + CF32="$(TYPECF32)" \ + CFOP="$(@buildopt@)" \ + LD="$(TYPELD)" \ +-LDOP="$(@buildopt@)" \ ++LDOP="$(LDFLAGS)" \ + LDSO="$(TYPELDSO)" \ + LIBS=" @ldsyslibs@ $(TYPELIBS)" \ + TYPE="$(TYPE)" +@@ -33,7 +33,7 @@ + CF32="$(TYPECF32)" \ + CFOP="$(@buildopt@)" \ + LD="$(TYPELD)" \ +-LDOP="$(@buildopt@)" \ ++LDOP="$(LDFLAGS)" \ + LDSO="$(TYPELDSO)" \ + LIBS=" @ldsyslibs@ $(TYPELIBS)" \ + TYPE="$(TYPE)" +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.fbsd 2010-12-18 05:02:29.765122076 +0300 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gcc 2010-12-18 05:02:29.765122078 +0300 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated -D__linux__ $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccia64 2010-12-18 05:02:29.765122078 +0300 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated -D__linux__ $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.gccx8664 2010-12-18 05:02:29.765122078 +0300 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated -D__linux__ $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -m64 -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc root/net/xrootd/src/xrootd/config/GNUmake.rules.icc +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.icc 2010-12-18 05:02:29.765122078 +0300 +@@ -13,7 +13,7 @@ + -ansi -D__linux__ -D__ICC__ -wd1476 -wd191 -wd468 -wd858 -wd1224 -wd584 $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -m32 -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.iccx8664 2010-12-18 05:02:29.765122078 +0300 +@@ -14,7 +14,7 @@ + -wd1572 -wd584 -i-dynamic $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -m64 -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos root/net/xrootd/src/xrootd/config/GNUmake.rules.macos +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos 2010-12-18 05:02:29.765122078 +0300 +@@ -18,7 +18,7 @@ + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + TYPELINK = -undefined dynamic_lookup -multiply_defined suppress +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + ifeq ($(subst $(MACOSX_MINOR),,1234),1234) + TYPELDSO = $(TYPELINK) -dynamiclib -single_module -m32 +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.macos64 2010-12-18 05:02:29.765122078 +0300 +@@ -15,7 +15,7 @@ + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + TYPELINK = -undefined dynamic_lookup -multiply_defined suppress +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + ifeq ($(subst $(MACOSX_MINOR),,1234),1234) + TYPELDSO = $(TYPELINK) -dynamiclib -single_module -m64 +diff -Naur root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc +--- root.orig/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2010-12-17 22:55:29.875476979 +0300 ++++ root/net/xrootd/src/xrootd/config/GNUmake.rules.sungcc 2010-12-18 05:02:29.765122078 +0300 +@@ -11,7 +11,7 @@ + -Wall -Wno-deprecated -DSUNGCC $(CFTRACE) + TYPECF32 = + TYPECF64 = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +-TYPEOPT = $(TYPEMISC) -O2 ++TYPEOPT = $(TYPEMISC) $(CXXFLAGS) + TYPEDBG = $(TYPEMISC) -g + TYPELDSO = -shared + TYPESHLIB = so +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2010-12-17 22:55:29.832148475 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdAcc/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +@@ -71,7 +71,7 @@ + + $(TESTBIN): $(OBJECTB) $(LIBDEPS) + @echo Creating executable $(TESTBIN) +- $(ECHO)$(LD) $(CFLAGS) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(TESTBIN) + + $(OBJDIR)/XrdAccAccess.o: XrdAccAccess.cc XrdAccAccess.hh \ + XrdAccCapability.hh XrdAccConfig.hh XrdAccGroups.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2010-12-17 22:55:29.822149591 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdApps/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +@@ -50,7 +50,7 @@ + + $(XRDADLER32): $(XRDADLER32_OBJ) $(XRDADLERDEPS) + @echo Creating executable $(XRDADLER32) +- $(ECHO)$(LD) $(LDOP) $(XRDADLER32_OBJ) $(XRDADLERLIBS) -o $(XRDADLER32) ++ $(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDADLER32_OBJ) $(XRDADLERLIBS) -o $(XRDADLER32) + + $(XRDADLER32_OBJ): Xrdadler32.cc \ + XrdPosixExtern.hh XrdPosixXrootd.hh \ +@@ -67,7 +67,7 @@ + + $(XRDMPXBIN): $(XRDMPXOBJ) + @echo Creating executable $(XRDMPXBIN) +- $(ECHO)$(LD) $(LDOP) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN) ++ $(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDMPXOBJ) $(XRDMPXLIBS) $(LIBS) -o $(XRDMPXBIN) + + $(XRDMPXOBJ): XrdMpxStats.cc \ + XrdNetDNS.hh XrdNetSocket.hh XrdNetOpts.hh \ +@@ -83,7 +83,7 @@ + + $(XRDW41): $(XRDW41_OBJ) $(XRDW41_DEPS) + @echo Creating executable $(XRDW41) +- $(ECHO)$(LD) $(LDOP) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41) ++ $(ECHO)$(CC) $(CXXFLAGS) $(LDFLAGS) $(XRDW41_OBJ) $(XRDW41LIBS) -o $(XRDW41) + + $(XRDW41_OBJ): XrdWait41.cc \ + XrdOucTList.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2010-12-17 22:55:29.845480323 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdBwm/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +@@ -67,7 +67,7 @@ + $(ECHO)ranlib $(LIBARCH) + + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) + + $(OBJDIR)/XrdBwm.o: XrdBwm.cc XrdBwm.hh \ + XrdAccAuthorize.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2010-12-17 22:55:29.818816629 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdClient/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +@@ -160,17 +160,17 @@ + $(LIBSHARED): $(OBJECTS) $(LIBDEP) + @echo Creating shared library $(LIBSHARED) + $(ECHO)rm -f $(LIBSHARED) +- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED) ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBSHARED) + ifneq ($(subst $(MACOSX_MINOR),,1234),1234) + $(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \ +- $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(TYPELDDY) $(LIBLIBS) $(LIBS) -o $(LIBDIR)/libXrdClient.$(TYPEDYLIB); \ + fi + endif + + $(LIBRARY_JNI): $(OBJECT_JNI) + @echo Creating shared library $(LIBRARY_JNI) + $(ECHO)rm -f $(LIBRARY_JNI); +- $(ECHO)$(CC) $(CFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI) ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECT_JNI) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY_JNI) + + $(CLASS_JNI_TARGET): $(CLASS_JNI).java + @echo Creating JNI class file $(CLASS_JNI_TARGET) +@@ -178,27 +178,27 @@ + + $(BINDIR)/TestXrdClient_read: $(OBJECTS) $(OBJECTD) $(LIBDEPS) + @echo Creating executable $(BINDIR)/TestXrdClient_read +- $(ECHO)$(LD) $(LDOP) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTD) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient_read + + $(BINDIR)/TestXrdClient: $(OBJECTS) $(OBJECTB) $(LIBDEPS) + @echo Creating executable $(BINDIR)/TestXrdClient +- $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(BINDIR)/TestXrdClient + + $(XRDCP): $(OBJECTS) $(OBJECTC) $(LIBDEPS) + @echo Creating executable $(XRDCP) +- $(ECHO)$(LD) $(LDOP) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(BINLIBS) $(LIBS) $(LIBZ) -o $(XRDCP) + + $(XRDPREPTOOL): $(OBJECTS) $(OBJECT_PREPTOOL) $(LIBDEPS) + @echo Creating executable $(XRDPREPTOOL) +- $(ECHO)$(LD) $(LDOP) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_PREPTOOL) $(BINLIBS) $(LIBS) -o $(XRDPREPTOOL) + + $(XRDSTAGETOOL): $(OBJECTS) $(OBJECT_STAGETOOL) $(LIBDEPS) + @echo Creating executable $(XRDSTAGETOOL) +- $(ECHO)$(LD) $(LDOP) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_STAGETOOL) $(BINLIBS) $(LIBS) -o $(XRDSTAGETOOL) + + $(XRDCLI): $(OBJECTS) $(OBJECT_CLI) $(LIBDEPS) + @echo Creating executable $(XRDCLI) +- $(ECHO)$(LD) $(LDOP) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECT_CLI) $(BINLIBS) $(LIBS) $(LIBREADLINE) -o $(XRDCLI) + + $(XRDADMIN): $(PERLMOD) + $(ECHO)if [ "$(PERLBIN)" != "" ]; then \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2010-12-17 22:55:29.835481437 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdCms/GNUmakefile 2010-12-18 05:02:29.765122078 +0300 +@@ -136,7 +136,7 @@ + + $(BINARY): $(OBJSRVR) $(OBJBOTH) $(LIBDEPS) + @echo Creating executable $(BINARY) +- $(ECHO)$(LD) $(LDOP) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJSRVR) $(OBJBOTH) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINARY) + + + $(LIBRARY): $(OBJCLNT) $(OBJBOTH) +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2010-12-17 22:55:29.868811057 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdCns/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +@@ -89,11 +89,11 @@ + + $(TARGCNSD): $(OBJCNSD) $(OBJCOM) $(LIBDEP) + @echo Creating executable $(BINDIR)/XrdCnsd +- $(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd ++ $(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJCNSD) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/XrdCnsd + + $(TARGSSI): $(OBJSSI) $(OBJCOM) $(LIBDEP) + @echo Creating executable $(BINDIR)/cns_ssi +- $(ECHO)$(LD) $(LDOP) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi ++ $(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJSSI) $(OBJCOM) $(LIBDEP) $(MORELIBS) $(LIBS) -o $(BINDIR)/cns_ssi + + $(OBJDIR)/XrdCnsConfig.o: XrdCnsConfig.hh XrdCnsConfig.cc \ + XrdCnsDaemon.hh XrdCnsLogRec.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2010-12-17 22:55:29.858812171 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdCrypto/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +@@ -139,7 +139,7 @@ + + $(LIBRARY): $(OBJECTS) $(LIBUTIL) + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBUTIL) -o $(LIBRARY) + + $(LIBASSL): $(OBJCSSL) + @echo Creating archive $(LIBASSL) +@@ -149,11 +149,11 @@ + + $(LIBCSSL): $(OBJCSSL) $(LIBARCH) $(LIBUTIL) + @echo Creating shared library $(LIBCSSL) +- $(ECHO)$(LD) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJCSSL) $(LDSO) $(LIBSSL) $(LIBARCH) $(LIBUTIL) -o $(LIBCSSL) + + $(CRYPTOTEST): $(OBJECTA) $(LIBARCH) $(LIBDEPS) + @echo Creating executable $(CRYPTOTEST) +- $(ECHO)$(LD) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBARCH) $(BINLIBS) $(LIBS) -o $(CRYPTOTEST) + + $(OBJDIR)/XrdCryptotest.o: XrdCryptotest.cc XrdSutAux.hh XProtocol.hh XrdSutBucket.hh \ + XrdCryptoAux.hh XrdCryptoFactory.hh XrdCryptoCipher.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2010-12-17 22:55:29.842147361 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdFrm/GNUmakefile 2010-12-18 05:06:33.900708559 +0300 +@@ -133,15 +133,15 @@ + + $(BINADMIN): $(OBJLIB) $(OBJADMIN) $(OBJDEPS) + @echo Creating executable $(BINADMIN) +- $(ECHO)$(LD) $(LDOP) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINADMIN) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJADMIN) $(OBJADDS) $(LIBREADLINE) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINADMIN) + + $(BINPURGD): $(OBJLIB) $(OBJPURG) $(OBJADDS) $(OBJDEPS) + @echo Creating executable $(BINPURGD) +- $(ECHO)$(LD) $(LDOP) $(OBJPURG) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINPURGD) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJPURG) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINPURGD) + + $(BINXFRD): $(OBJLIB) $(OBJXFR) $(OBJADDS) $(OBJDEPS) + @echo Creating executables $(BINXFRD) +- $(ECHO)$(LD) $(LDOP) $(OBJXFR) $(OBJADDS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(BINXFRD) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJXFR) $(OBJADDS) $(BINLIBS) $(LIBS) $(TYPELIBMT) -o $(BINXFRD) + + $(BINAGNT): $(BINXFRD) + @echo Creating executables $(BINAGNT) +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2010-12-17 22:55:29.852146247 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdMon/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +@@ -141,45 +141,45 @@ + + $(ADMIN): $(OBJECTS_BIN_ADM) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys + + $(COLLECTOR): $(OBJECTS_BIN_CTR) $(LIBRARY_CTR) \ + $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ -L$(LIBDIR) -lXrdSys + + $(CONVTIME): $(OBJECTS_BIN_CTM) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ + + $(COUT2FILE): $(OBJECTS_BIN_C2F) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ + + $(DEBUGPACKET): $(OBJECTS_BIN_DBP) $(LIBRARY_DEC) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ + + $(DECODER): $(OBJECTS_BIN_DEC) $(LIBRARY_DEC) $(LIBRARY_OUC) \ + $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ + + $(DUMPPACKETS): $(OBJECTS_BIN_DMP) $(LIBRARY_DEC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ $^ + + $(FSENDER): $(OBJECTS_BIN_FSD) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ + + $(SENDER): $(OBJECTS_BIN_SND) $(LIBRARY_SND) $(LIBRARY_OUC) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ -L$(LIBDIR) -lXrdSys + + $(TESTPARSER): $(OBJECTS_BIN_TPR) $(LIBRARY_COMMON) + @echo Creating executable $(@F) +- $(ECHO)$(CC) $(CFLAGS) $(LDOP) $(LIBS) -lresolv -o $@ $^ ++ $(ECHO)$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lresolv -o $@ $^ + + $(OBJDIR)/%.o : %.cc + @echo Compiling $(<F) +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile 2010-12-17 22:55:29.822149591 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdPosix/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +@@ -76,14 +76,14 @@ + + $(LIBPLDR): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP) + @echo Creating shared library $(LIBPLDR) +- $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR) ++ $(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(OBJECTT) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBPLDR) + + $(LIBRARY): $(OBJECTP) $(OBJECTS) $(OBJECTT) $(LIBDEP) + @echo Creating shared library $(LIBRARY) + $(ECHO)$(CC) $(CFLAGS) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) + ifneq ($(subst $(MACOSX_MINOR),,1234),1234) + $(ECHO)if [ "x$(TYPE)" = "xDarwin" ]; then \ +- $(CC) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \ ++ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(TYPELDDY) $(MORELIBS) $(LIBS) -o $(LIBDIR)/libXrdPosix.$(TYPEDYLIB); \ + fi + endif + # MacOS X does not support linking against shared libraries so include +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile 2010-12-17 22:55:29.822149591 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdPss/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +@@ -66,7 +66,7 @@ + + $(TARGETS): $(OBJECTS) $(OBJECTT) $(LIBDEP) + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECTT) $(OBJECTS) $(OBJECTU) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY) + + $(OBJDIR)/XrdPss.o: XrdPss.cc XrdPss.hh XrdPosixXrootd.hh \ + XrdOss.hh XrdOssError.hh XrdOucEnv.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile 2010-12-17 22:55:29.872144019 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdRootd/GNUmakefile 2010-12-18 05:34:05.382687770 +0300 +@@ -6,7 +6,7 @@ + + include ../GNUmake.env + +-LFLAGS = -L$(LIBDIR) -lXrdOuc $(LDSO) ++LFLAGS = $(LDSO) -L$(LIBDIR) -lXrdOuc + + LIBDEPS = $(LIBDIR)/libXrdOuc.a + +@@ -48,7 +48,7 @@ + + $(TARGETS): $(OBJECTS) $(LIBDEPS) + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(OBJECTS) $(LFLAGS) -o $(LIBRARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LFLAGS) -o $(LIBRARY) + + $(OBJDIR)/XrdRootdProtocol.o: XrdRootdProtocol.hh XrdLink.hh \ + XrdScheduler.hh XrdTrace.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile 2010-12-17 22:55:29.845480323 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSec/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +@@ -78,15 +78,15 @@ + + $(LIBRARY): $(OBJSLIB) $(LIBDEPS) + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY); ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY); + + $(TSTBINA): $(OBJECTA) $(LIBDEPS) + @echo Creating executable $(TSTBINA) +- $(ECHO)$(LD) $(LDOP) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(LIBS) $(BINLIBS) -o $(TSTBINA) + + $(TSTBINB): $(OBJECTB) $(LIBDEPS) + @echo Creating executable $(TSTBINB) +- $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(LIBS) $(BINLIBS) -o $(TSTBINB) + + $(OBJDIR)/XrdSecClient.o: XrdSysPthread.hh XrdSecPManager.hh XrdSecInterface.hh \ + XrdOucErrInfo.hh XrdSecClient.cc XrdSecEntity.hh +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile 2010-12-17 22:55:29.838814399 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSecgsi/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +@@ -109,19 +109,19 @@ + + $(LIBRARY): $(OBJECTS) $(LIBDEPS) + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(LD) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(LIBLIBS) $(LIBS) -o $(LIBRARY) + + $(LIBLDAP): $(OBJECTC) + @echo Creating shared library $(LIBLDAP) +- $(ECHO)$(LD) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBLDAP) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTC) $(LDSO) $(LIBS) -o $(LIBLDAP) + + $(SECGSITEST): $(OBJECTA) $(LIBDEPS) + @echo Creating executable $(SECGSITEST) +- $(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS) -o $(SECGSITEST) + + $(SECGSIPROXY): $(OBJECTB) $(LIBDEPS) + @echo Creating executable $(SECGSIPROXY) +- $(ECHO)$(LD) $(LDOP) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTB) $(BINLIBS) $(LIBS) -o $(SECGSIPROXY) + + $(OBJDIR)/XrdSecgsitest.o: XrdSecgsitest.cc XrdOucString.hh \ + XrdSysError.hh XrdSutAux.hh XProtocol.hh XPtypes.hh XrdCryptoAux.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile 2010-12-17 22:55:29.825482553 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSeckrb4/GNUmakefile 2010-12-18 05:02:29.771787705 +0300 +@@ -45,7 +45,7 @@ + + $(TARGETS): $(OBJECTS) $(LIBDEPS) + @echo Creating shared library $(TARGETS) +- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); + + $(OBJDIR)/XrdSecProtocolkrb4.o: XrdSecProtocolkrb4.cc XrdSecInterface.hh \ + XrdSysPthread.hh XrdOucTokenizer.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile 2010-12-17 22:55:29.855479209 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSeckrb5/GNUmakefile 2010-12-18 05:02:29.775120520 +0300 +@@ -49,7 +49,7 @@ + + $(TARGETS): $(OBJECTS) $(LIBDEPS) + @echo Creating shared library $(TARGETS) +- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); + + $(OBJDIR)/XrdSecProtocolkrb5.o: XrdSecProtocolkrb5.cc XrdSecInterface.hh \ + XrdSysPthread.hh XrdOucTokenizer.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile 2010-12-17 22:55:29.862145133 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSecpwd/GNUmakefile 2010-12-18 05:02:29.775120520 +0300 +@@ -65,11 +65,11 @@ + + $(LIBRARY): $(OBJECTS) $(LIBDEPS) + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(LIBRARY) + + $(SRVADMIN): $(OBJECTA) $(LIBDEPS) + @echo Creating executable $(SRVADMIN) +- $(ECHO)$(LD) $(LDOP) $(OBJECTA) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(SRVADMIN) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) $(BINLIBS) $(LIBS) $(RESOLVLIB) -o $(SRVADMIN) + + $(OBJDIR)/XrdSecpwdSrvAdmin.o: XrdSecpwdSrvAdmin.cc \ + XrdOucString.hh XrdSutAux.hh XProtocol.hh XPtypes.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile 2010-12-17 22:55:29.848813285 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSecssl/GNUmakefile 2010-12-18 05:02:29.775120520 +0300 +@@ -85,7 +85,7 @@ + + $(LIBRARY): $(OBJECTS) $(LIBDEPS) + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY); ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(LIBRARY); + + $(LIBGRST): $(OBJGRST) + @echo Creating archive $(LIBGRST) +@@ -95,7 +95,7 @@ + + $(SECSSLTEST): $(OBJECTA) $(LIBDEPS) + @echo Creating executable $(SECSSLTEST) +- $(ECHO)$(LD) $(LDOP) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTA) -L$(LIBDIR) -lXrdSecssl $(MORELIBS) $(LIBS) -o $(SECSSLTEST) + + $(OBJDIR)/XrdSecProtocolsslProc.o: XrdSecProtocolsslProc.cc XrdSecProtocolsslProc.hh \ + XrdOucString.hh XrdOucHash.hh +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile 2010-12-17 22:55:29.855479209 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSecsss/GNUmakefile 2010-12-18 05:02:29.775120520 +0300 +@@ -69,11 +69,11 @@ + + $(TARGLIB): $(OBJSLIB) $(LIBDEPS) + @echo Creating shared library $(TARGLIB) +- $(ECHO)$(CC) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLIB); ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJSLIB) $(LDSO) $(MORELIBS) $(LIBSSL) $(LIBS) -o $(TARGLIB); + + $(TARGBIN): $(OBJSBIN) + @echo Creating executable $(TARGBIN) +- $(ECHO)$(LD) $(LDOP) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN); ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJSBIN) $(MORELIBS) $(LIBS) -o $(TARGBIN); + + $(OBJDIR)/XrdSecProtocolsss.o: XrdSecProtocolsss.cc XrdSecProtocolsss.hh \ + XrdNetDNS.hh XrdOucErrInfo.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile 2010-12-17 22:55:29.842147361 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSecunix/GNUmakefile 2010-12-18 05:02:29.775120520 +0300 +@@ -45,7 +45,7 @@ + + $(TARGETS): $(OBJECTS) $(LIBDEPS) + @echo Creating shared library $(TARGETS) +- $(ECHO)$(CC) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LDSO) $(MORELIBS) $(LIBS) -o $(TARGETS); + + $(OBJDIR)/XrdSecProtocolunix.o: XrdSecProtocolunix.cc XrdSecInterface.hh \ + XrdSysHeaders.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile 2010-12-17 22:55:29.865478095 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdSut/GNUmakefile 2010-12-18 05:02:29.775120520 +0300 +@@ -67,7 +67,7 @@ + + $(LIBRARY): $(OBJECTS) $(LIBDIR)/libXrdOuc.a + @echo Creating shared library $(LIBRARY) +- $(ECHO)$(CC) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(LIBDIR)/libXrdOuc.a $(LDSO) -o $(LIBRARY) + + $(OBJDIR)/XrdSutPFAdmin.o: XrdSutPFAdmin.cc XrdOucString.hh \ + XrdSutAux.hh XProtocol.hh XPtypes.hh \ +diff -Naur root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile +--- root.orig/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile 2010-12-17 22:55:29.865478095 +0300 ++++ root/net/xrootd/src/xrootd/src/XrdXrootd/GNUmakefile 2010-12-18 05:02:29.775120520 +0300 +@@ -94,7 +94,7 @@ + + $(TARGETS): $(OBJECTS) $(OBJDEPS) + @echo Creating executable $(TARGETS) +- $(ECHO)$(LD) $(LDOP) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS) ++ $(ECHO)$(CC) $(LDFLAGS) $(OBJECTS) $(OBJFS) $(LIBS) $(BINLIBS) $(TYPELIBMT) -o $(TARGETS) + + $(OBJDIR)/XrdXrootdAdmin.o: XrdXrootdAdmin.hh XrdXrootdAdmin.cc \ + XrdXrootdTrace.hh XrdXrootdProtocol.hh \ diff --git a/sci-physics/root/metadata.xml b/sci-physics/root/metadata.xml index ff327892b..b25de994f 100644 --- a/sci-physics/root/metadata.xml +++ b/sci-physics/root/metadata.xml @@ -15,7 +15,9 @@ <flag name="clarens"> Buld the Clarens and PEAC plug-ins, to use in a GRID enabled analysis.</flag> + <flag name="fits">Support for images and data from FITS files</flag> <flag name="geant4">Build the <pkg>sci-physics/geant</pkg> (GEANT4) navigator</flag> + <flag name="fits">Build the new cling interactive interpreter based on <pkg>sys-devel/llvm</pkg></flag> <flag name="math">Build all math related libraries plugins, needs <pkg>sci-libs/gsl</pkg> </flag> <flag name="pythia6"> Builds the interface to Pythia-6 (<pkg>sci-physics/pythia</pkg>) diff --git a/sci-physics/root/root-5.26.00e.ebuild b/sci-physics/root/root-5.28.00.ebuild index c42bf2fea..075c500b8 100644 --- a/sci-physics/root/root-5.26.00e.ebuild +++ b/sci-physics/root/root-5.28.00.ebuild @@ -1,21 +1,23 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.26.00-r4.ebuild,v 1.4 2010/07/06 15:59:37 bicatali Exp $ +# $Header: $ EAPI=3 PYTHON_DEPEND="python? 2" +SUPPORT_PYTHON_ABIS="1" +RUBY_OPTIONAL="yes" +USE_RUBY="ruby18" -inherit versionator eutils qt4 elisp-common fdo-mime python toolchain-funcs +inherit versionator eutils elisp-common fdo-mime python toolchain-funcs flag-o-matic -DOC_PV=$(get_major_version)_$(get_version_component_range 2) +#DOC_PV=$(get_major_version)_$(get_version_component_range 2) +DOC_PV=5_26 ROOFIT_DOC_PV=2.91-33 -TMVA_DOC_PV=4 -PATCH_PV=p01 +TMVA_DOC_PV=4.03 DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="http://root.cern.ch/" -# mirror://gentoo/${P}-patches-${PATCH_PV}.tar.bz2 SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz doc? ( ftp://root.cern.ch/root/doc/Users_Guide_${DOC_PV}.pdf @@ -24,9 +26,9 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz SLOT="0" LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~hppa ~sparc ~x86" -IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap - +math mysql odbc +opengl openmp oracle postgres pythia6 pythia8 python +KEYWORDS="~amd64 ~x86" +IUSE="afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap llvm + +math mysql ncurses odbc +opengl openmp oracle postgres pythia6 pythia8 python +reflex ruby qt4 ssl xft xml xinetd xrootd" # libafterimage ignored, to check every version @@ -34,25 +36,30 @@ IUSE="afs clarens doc emacs examples fftw geant4 graphviz kerberos ldap # || ( >=media-libs/libafterimage-1.18 x11-wm/afterstep ) CDEPEND=">=dev-lang/cfortran-4.4-r2 dev-libs/libpcre - >=media-libs/ftgl-2.1.3_rc5 - media-libs/libpng - media-libs/jpeg + media-libs/ftgl media-libs/giflib media-libs/glew + media-libs/jpeg + media-libs/libpng media-libs/tiff sys-apps/shadow - x11-libs/libXpm + x11-libs/libX11 + x11-libs/libXext x11-libs/libXft + x11-libs/libXpm afs? ( >=net-fs/openafs-1.4.7 ) + avahi? ( net-dns/avahi ) clarens? ( dev-libs/xmlrpc-c ) emacs? ( virtual/emacs ) + fits? ( sci-libs/cfitsio ) fftw? ( sci-libs/fftw:3.0 ) - geant4? ( sci-physics/geant:4 ) graphviz? ( media-gfx/graphviz ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) - math? ( >=sci-libs/gsl-1.8 ) + llvm? ( sys-devel/llvm ) + math? ( sci-libs/gsl sci-mathematics/unuran ) mysql? ( virtual/mysql ) + ncurses? ( sys-libs/ncurses ) odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) ) opengl? ( virtual/opengl virtual/glu ) oracle? ( dev-db/oracle-instantclient-basic ) @@ -62,6 +69,8 @@ CDEPEND=">=dev-lang/cfortran-4.4-r2 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 + x11-libs/qt-svg:4 + x11-libs/qt-webkit:4 x11-libs/qt-xmlpatterns:4 ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) @@ -72,6 +81,7 @@ DEPEND="${CDEPEND} dev-util/pkgconfig" RDEPEND="${CDEPEND} + reflex? ( dev-cpp/gccxml ) xinetd? ( sys-apps/xinetd )" S="${WORKDIR}/${PN}" @@ -80,7 +90,7 @@ pkg_setup() { elog elog "You may want to build ROOT with these non Gentoo extra packages:" elog "AliEn, castor, Chirp, dCache, gfal, gLite, Globus," - elog "Monalisa, MaxDB/SapDB, SRP." + elog "HDFS, Monalisa, MaxDB/SapDB, SRP." elog "You can use the env variable EXTRA_ECONF variable for this." elog "For example, for SRP, you would set: " elog "EXTRA_ECONF=\"--enable-srp --with-srp-libdir=/usr/$(get_libdir)\"" @@ -88,38 +98,34 @@ pkg_setup() { enewgroup rootd enewuser rootd -1 -1 /var/spool/rootd rootd - if use openmp && \ - [[ $(tc-getCC)$ == *gcc* ]] && \ - ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || \ - ! has_version sys-devel/gcc[openmp] ); then + if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then ewarn "You are using gcc and OpenMP is available with gcc >= 4.2" ewarn "If you want to build this package with OpenMP, abort now," ewarn "and set CC to an OpenMP capable compiler" - epause 5 elif use openmp; then export USE_OPENMP=1 use math && export USE_PARALLEL_MINUIT2=1 fi - use python && python_set_active_version 2 +} + +src_unpack() { + # prevent ruby-ng.eclass from messing with the src path + default } src_prepare() { - epatch "${FILESDIR}"/${P}-make-3.82.patch - epatch "${FILESDIR}"/${P}-prop-ldflags.patch - epatch "${FILESDIR}"/${P}-xrootd-prop-flags.patch - epatch "${FILESDIR}"/${P}-configure-paths.patch - epatch "${FILESDIR}"/${P}-nobyte-compile.patch - epatch "${FILESDIR}"/${P}-glibc212.patch + epatch \ + "${FILESDIR}"/${P}-prop-ldflags.patch \ + "${FILESDIR}"/${P}-configure-paths.patch \ + "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-nobyte-compile.patch \ + "${FILESDIR}"/${P}-glibc212.patch \ + "${FILESDIR}"/${P}-xrootd-prop-flags.patch \ + "${FILESDIR}"/${P}-unuran.patch # use system cfortran rm montecarlo/eg/inc/cfortran.h README/cfortran.doc - # take a more descriptive name for ruby libs - sed -i \ - -e 's/libRuby/libRubyROOT/g' \ - bindings/ruby/Module.mk bindings/ruby/src/drr.cxx \ - || die "ajusting ruby libname failed" - # in gentoo, libPythia6 is called libpythia6 # libungif is called libgif sed -i \ @@ -133,6 +139,12 @@ src_prepare() { -e 's/CFLAGS=$$ACFLAGS//' \ graf2d/asimage/Module.mk graf2d/asimage/src/libAfterImage/configure \ || die "flag propagation in libafterimage failed" + + # prefixify the configure script + sed -i \ + -e 's:/usr:${EPREFIX}/usr:g' \ + configure || die "prefixify configure failed" + # QTDIR only used for qt3 in gentoo, and configure looks for it. unset QTDIR } @@ -140,15 +152,15 @@ src_prepare() { src_configure() { # the configure script is not the standard autotools ./configure \ - --with-cc=$(tc-getCC) \ - --with-cxx=$(tc-getCXX) \ - --with-f77=$(tc-getFC) \ - --fail-on-missing \ --prefix="${EPREFIX}"/usr \ + --etcdir="${EPREFIX}"/etc \ --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ --tutdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tutorials \ --testdir="${EPREFIX}"/usr/share/doc/${PF}/examples/tests \ + --with-cc=$(tc-getCC) \ + --with-cxx=$(tc-getCXX) \ + --with-f77=$(tc-getFC) \ --with-sys-iconpath="${EPREFIX}"/usr/share/pixmaps \ --disable-builtin-freetype \ --disable-builtin-ftgl \ @@ -166,20 +178,25 @@ src_configure() { --enable-shared \ --enable-soversion \ --enable-table \ + --fail-on-missing \ --with-afs-shared=yes \ $(use_enable afs) \ + $(use_enable avahi bonjour) \ $(use_enable clarens) \ $(use_enable clarens peac) \ + $(use_enable ncurses editline) \ + $(use_enable fits fitsio) \ $(use_enable fftw fftw3) \ - $(use_enable geant4 g4root) \ $(use_enable graphviz gviz) \ $(use_enable kerberos krb5) \ $(use_enable ldap) \ + $(use_enable llvm cling) \ $(use_enable math gsl-shared) \ $(use_enable math genvector) \ $(use_enable math mathmore) \ $(use_enable math minuit2) \ $(use_enable math roofit) \ + $(use_enable math tmva) \ $(use_enable math unuran) \ $(use_enable mysql) \ $(use_enable odbc) \ @@ -270,13 +287,11 @@ src_install() { echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/root" > 99root use pythia8 && echo "PYTHIA8=${EPREFIX}/usr" >> 99root - use python && echo "PYTHONPATH=${EPREFIX}/usr/$(get_libdir)/root" >> 99root - use ruby && echo "RUBYLIB=${EPREFIX}/usr/$(get_libdir)/root" >> 99root doenvd 99root || die "doenvd failed" # The build system installs Emacs support unconditionally and in the wrong # directory. Remove it and call elisp-install in case of USE=emacs. - rm -rf "${D}"/usr/share/emacs + rm -rf "${ED}"/usr/share/emacs if use emacs; then elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed" fi @@ -285,6 +300,21 @@ src_install() { daemon_install desktop_install + if use python; then + local pydir=$(python_get_sitedir) + dodir $(pydir) + mv "${ED}"usr/$(get_libdir)/${PN}/*.py \ + "${ED}"$(pydir) + dosym "${ED}"usr/$(get_libdir)/${PN}/libPyROOT.so \ + ${pydir}/libPyROOT.so + fi + + if use ruby; then + local rubydir=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') + dodir ${rubydir} + dosym "${ED}"usr/$(get_libdir)/${PN}/libRuby.so ${rubydir}/libRuby.so + fi + # Cleanup of files either already distributed or unused on Gentoo rm "${ED}"usr/share/doc/${PF}/{INSTALL,LICENSE,COPYING.CINT} rm "${ED}"usr/share/root/fonts/LICENSE @@ -295,15 +325,17 @@ src_install() { rm -f "${ED}"/etc/root/proof/*.sample rm -rf "${ED}"/etc/root/daemons popd > /dev/null + # these should be in PATH + mv "${ED}"usr/share/root/proof/utils/pq2/pq2* \ + "${ED}"usr/bin } pkg_postinst() { - use ruby && elog "ROOT Ruby module is available as libRubyROOT" fdo-mime_desktop_database_update - use python && python_mod_optimize /usr/$(get_libdir)/root + use python && python_mod_optimize } pkg_postrm() { fdo-mime_desktop_database_update - use python && python_mod_cleanup /usr/$(get_libdir)/root + use python && python_mod_cleanup } |