r2433 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2007-07-21 23:22:36 +0000 (Sat, 21 Jul 2007)
New Revision: 2433
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
Log:
* rules.d/build.mk: create /etc/ld.so.conf.d/libc.conf to add
/usr/local/lib as a default search path. Closes: #395177.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-21 23:08:02 UTC (rev 2432)
+++ glibc-package/trunk/debian/changelog 2007-07-21 23:22:36 UTC (rev 2433)
@@ -21,6 +21,8 @@
- *i386 (floating point regressions).
* patches/any/cvs-ld_library_path.diff: new patch from CVS to fix segfaults
with empty LD_LIBRARY_PATH variable.
+ * rules.d/build.mk: create /etc/ld.so.conf.d/libc.conf to add
+ /usr/local/lib as a default search path. Closes: #395177.
[ Pierre Habouzit ]
* rules.d/debhelper.mk: add some magic to copy debian/bug/$pkg/ files into
@@ -47,11 +49,8 @@
* hurd-i386/local-sigsuspend-nocancel.diff: renamed into
submitted-sigsuspend-nocancel.diff.
- [ Aurelien Jarno ]
- *
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 22 Jul 2007 01:21:40 +0200
- -- Aurelien Jarno <aurel32@debian.org> Sun, 22 Jul 2007 00:50:17 +0200
-
glibc (2.6-2) unstable; urgency=low
[ Clint Adams ]
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2007-07-21 23:08:02 UTC (rev 2432)
+++ glibc-package/trunk/debian/rules.d/build.mk 2007-07-21 23:22:36 UTC (rev 2433)
@@ -145,6 +145,13 @@
echo /lib/$$triplet >> $$conffile; \
echo /usr/lib/$$triplet >> $$conffile; \
fi
-
+
+ # Create a default configuration file that adds /usr/local/lib to the search path
+ if [ $(curpass) = libc ]; then \
+ mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
+ echo "# libc default configuration" > debian/tmp-$(curpass)/etc/ld.so.conf.d/libc.conf ; \
+ echo /usr/local/lib >> debian/tmp-$(curpass)/etc/ld.so.conf.d/libc.conf ; \
+ fi
+
$(call xx,extra_install)
touch $@
Reply to: