Author: aurel32
Date: 2006-02-24 14:38:44 +0000 (Fri, 24 Feb 2006)
New Revision: 1233
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/sysdeps/amd64.mk
Log:
* Use a shell function instead of ifneq when testing a variable depending on
$(curpass), otherwise it is only evaluated at the first pass.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-23 20:47:02 UTC (rev
1232)
+++ glibc-package/trunk/debian/changelog 2006-02-24 14:38:44 UTC (rev
1233)
@@ -1,6 +1,8 @@
glibc (2.3.6-3) UNRELEASED; urgency=low
- *
+ [ Aurelien Jarno]
+ * Use a shell function instead of ifneq when testing a variable depending on
+ $(curpass), otherwise it is only evaluated at the first pass.
-- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 23 Feb 2006 21:46:25 +0100
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-02-23 20:47:02 UTC (rev
1232)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-02-24 14:38:44 UTC (rev
1233)
@@ -35,15 +35,15 @@
echo "LIBGD = no" >> $(DEB_BUILDDIR)/configparms
echo "sysconfdir = /etc" >> $(DEB_BUILDDIR)/configparms
echo "rootsbindir = /sbin" >> $(DEB_BUILDDIR)/configparms
-ifneq ($(call xx,libdir),)
- echo "libdir = $(call xx,libdir)" >> $(DEB_BUILDDIR)/configparms
-endif
-ifneq ($(call xx,slibdir),)
- echo "slibdir = $(call xx,slibdir)" >> $(DEB_BUILDDIR)/configparms
-endif
-ifneq ($(call xx,rtlddir),)
- echo "rtlddir = $(call xx,rtlddir)" >> $(DEB_BUILDDIR)/configparms
-endif
+ libdir="$(call xx,libdir)" ; if test -n "$$libdir" ; then \
+ echo "libdir = $$libdir" >> $(DEB_BUILDDIR)/configparms ; \
+ fi
+ slibdir="$(call xx,slibdir)" ; if test -n "$$slibdir" ; then \
+ echo "slibdir = $$slibdir" >> $(DEB_BUILDDIR)/configparms ; \
+ fi
+ rtlddir="$(call xx,rtlddir)" ; if test -n "$$rtlddir" ; then \
+ echo "rtlddir = $$rtlddir" >> $(DEB_BUILDDIR)/configparms ; \
+ fi
# Prevent autoconf from running unexpectedly by setting it to false.
# Also explicitly pass CC down - this is needed to get -m64 on
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2006-02-23 20:47:02 UTC (rev
1232)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2006-02-24 14:38:44 UTC (rev
1233)
@@ -2,9 +2,9 @@
libc_MIN_KERNEL_SUPPORTED = 2.6.0
libc_add-ons = nptl $(add-ons)
libc_extra_cflags = -O3 -g1
-slibdir = /lib
-libdir = /usr/lib
-rtlddir = /lib64
+libc_slibdir = /lib
+libc_libdir = /usr/lib
+libc_rtlddir = /lib64
# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
define libc6_extra_pkg_install
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
