Author: justin
Date: 2006-07-12 01:44:53 -0600 (Wed, 12 Jul 2006)
New Revision: 1602

Modified:
   branches/cross/packages/libidn/Makefile
   branches/cross/packages/shadow/Makefile
Log:
Upgraded shadow to 4.0.16.  Removed more LIB_MAYBE64s.

Modified: branches/cross/packages/libidn/Makefile
===================================================================
--- branches/cross/packages/libidn/Makefile     2006-07-12 07:29:41 UTC (rev 
1601)
+++ branches/cross/packages/libidn/Makefile     2006-07-12 07:44:53 UTC (rev 
1602)
@@ -20,7 +20,7 @@
        $(std_build)
 
 compile-stage2:
-       ./configure --prefix=/usr --libdir=/usr/$(LIB_MAYBE64)
+       ./configure --prefix=/usr --libdir=/usr/lib
        make $(PM)
        make install
 

Modified: branches/cross/packages/shadow/Makefile
===================================================================
--- branches/cross/packages/shadow/Makefile     2006-07-12 07:29:41 UTC (rev 
1601)
+++ branches/cross/packages/shadow/Makefile     2006-07-12 07:44:53 UTC (rev 
1602)
@@ -1,12 +1,12 @@
 # Shadow Makefile
 
 NM= shadow
-VRS= 4.0.15
+VRS= 4.0.16
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 0f7cd3366a032091fdffd2f8edf65056bd576cae
+SHA-$(FILE)= c8e739d935cb46d9cbc0654f373c2bff18110a55
 
 # Targets
 
@@ -21,43 +21,20 @@
        cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage2:
-ifndef CROSS
-       ./configure --libdir=/lib --enable-shared --without-selinux
-else
-       CC="gcc $(64FLAGS)" ./configure --libdir=/lib64 \
-        --enable-shared --without-selinux
-endif
+       ./configure --libdir=/lib --sysconfdir=/etc --enable-shared \
+        --without-libpam --without-audit --without-selinux
        sed -i 's/groups$$(EXEEXT) //' src/Makefile
-       find man -name Makefile -exec sed -i '/groups/d' {} \;
-       sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
-       ../convert-mans UTF-8 ISO-8859-2 man/cs/*.?
-       ../convert-mans UTF-8 ISO-8859-1 man/de/*.?
-       ../convert-mans UTF-8 ISO-8859-1 man/es/*.?
-       ../convert-mans UTF-8 ISO-8859-1 man/fi/*.?
-       ../convert-mans UTF-8 ISO-8859-1 man/fr/*.?
-       ../convert-mans UTF-8 ISO-8859-2 man/hu/*.?
-       ../convert-mans UTF-8 ISO-8859-1 man/id/*.?
-       ../convert-mans UTF-8 ISO-8859-1 man/it/*.?
-       ../convert-mans UTF-8 EUC-JP man/ja/*.?
-       # ../convert-mans UTF-8 EUC-KR man/ko/*.?
-       ../convert-mans UTF-8 ISO-8859-2 man/pl/*.?
-       ../convert-mans UTF-8 ISO-8859-1 man/pt_BR/*.?
-       ../convert-mans UTF-8 KOI8-R man/ru/*.?
-       ../convert-mans UTF-8 ISO-8859-9 man/tr/*.?
-       # ../convert-mans UTF-8 GB2312 man/zh_CN/*.?
-       # ../convert-mans UTF-8 BIG5 man/zh_TW/*.?
+       sed -i '/groups/d' man/Makefile
        make $(PM)
        make install
-       cp etc/{limits,login.access} /etc
-       sed -e '[EMAIL PROTECTED]@MD5_CRYPT_ENAB yes@' \
-            -e 's@/var/spool/mail@/var/mail@' \
-            -e '[EMAIL PROTECTED]@MAIL_CHECK_ENAB no@' \
-            etc/login.defs > /etc/login.defs
+       sed -i -e '[EMAIL PROTECTED]@MD5_CRYPT_ENAB yes@' \
+              -e 's@/var/spool/mail@/var/mail@' \
+              -e '[EMAIL PROTECTED]@MAIL_CHECK_ENAB no@' \
+        etc/login.defs
        mv -v /usr/bin/passwd /bin
-       mv -v /$(LIB_MAYBE64)/libshadow.*a /usr/$(LIB_MAYBE64)
-       rm -v /$(LIB_MAYBE64)/libshadow.so
-       ln -sfv ../../$(LIB_MAYBE64)/libshadow.so.0 
/usr/$(LIB_MAYBE64)/libshadow.so
-       mkdir -pv /etc/default
+       mv -v /lib/libshadow.*a /usr/lib
+       rm -v /lib/libshadow.so
+       ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so
        pwconv
        grpconv
 

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to