From: Stephen Walker <stephendwalker@gmail.com>
Date: Thu, 14 Jul 2011 18:38:34 +0000 (+0000)
Subject: perl: link with libbsd for (e)glibc, refresh patches, Signed-off-by: Philip Prindevil... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c7d7a262d5cb8d3b4f82ea813286cd64c6bc1abe;p=openwrt%2Fsvn-archive%2Fpackages.git

perl: link with libbsd for (e)glibc, refresh patches, Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

SVN-Revision: 27611
---

diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index dd0fc06d8..72873fa3f 100644
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@@ -22,12 +22,18 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
+ifneq ($(CONFIG_USE_EGLIBC)$(CONFIG_USE_GLIBC),)
+EXTRA_LIBS:=bsd
+EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
+endif
+
 define Package/perl/Default
   SUBMENU:=Perl
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=The Perl intepreter
   URL:=http://www.perl.com/
+  DEPENDS:=+(USE_EGLIBC||USE_GLIBC):libbsd
 endef
 
 define Package/microperl
@@ -107,6 +113,8 @@ define Build/perl/Configure
 		-e 's!%%LDFLAGS%%!-rdynamic $(TARGET_LDFLAGS)!g' \
 		-e 's!%%LIBDIRS%%!$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib!g' \
 		-e 's!%%INCDIRS%%!$(STAGING_DIR)/include $(STAGING_DIR)/usr/include!g' \
+		-e 's!%%EXTRA_PERLLIBS%%!$(EXTRA_LIBS:%=-l%)!g' \
+		-e 's!%%EXTRA_PERLLIBDIRS%%!$(EXTRA_LIBDIRS:%=-L%)!g' \
 		files/config.sh-$(patsubst i386,i486,$(ARCH)).in \
 		> $(PKG_BUILD_DIR)/config.sh
 	(cd $(PKG_BUILD_DIR) && ./Configure -S)
diff --git a/lang/perl/files/config.sh-arm.in b/lang/perl/files/config.sh-arm.in
index ae87c592a..a21991faf 100644
--- a/lang/perl/files/config.sh-arm.in
+++ b/lang/perl/files/config.sh-arm.in
@@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/
 ksh=''
 ld='%%LD%%'
 lddlflags='-shared %%LDFLAGS%%'
-ldflags=''
+ldflags='%%EXTRA_PERLLIBDIRS%%'
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
@@ -832,7 +832,7 @@ perl5=''
 perl=''
 perl_patchlevel=''
 perladmin='root@maia.dev.null'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
diff --git a/lang/perl/files/config.sh-armeb.in b/lang/perl/files/config.sh-armeb.in
index ced3b7295..81bc555ef 100644
--- a/lang/perl/files/config.sh-armeb.in
+++ b/lang/perl/files/config.sh-armeb.in
@@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/
 ksh=''
 ld='%%LD%%'
 lddlflags='-shared %%LDFLAGS%%'
-ldflags=''
+ldflags='%%EXTRA_PERLLIBDIRS%%'
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
@@ -832,7 +832,7 @@ perl5=''
 perl=''
 perl_patchlevel=''
 perladmin='root@maia.dev.null'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
diff --git a/lang/perl/files/config.sh-avr32.in b/lang/perl/files/config.sh-avr32.in
index d7f148dcb..1108364d5 100644
--- a/lang/perl/files/config.sh-avr32.in
+++ b/lang/perl/files/config.sh-avr32.in
@@ -737,7 +737,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/
 ksh=''
 ld='%%LD%%'
 lddlflags='-shared %%LDFLAGS%%'
-ldflags=''
+ldflags='%%EXTRA_PERLLIBDIRS%%'
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
@@ -834,7 +834,7 @@ perl5=''
 perl=''
 perl_patchlevel=''
 perladmin='root@maia.dev.null'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
diff --git a/lang/perl/files/config.sh-i486.in b/lang/perl/files/config.sh-i486.in
index 2cb2b5269..d05fdd0ff 100644
--- a/lang/perl/files/config.sh-i486.in
+++ b/lang/perl/files/config.sh-i486.in
@@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/
 ksh=''
 ld='%%LD%%'
 lddlflags='-shared %%LDFLAGS%%'
-ldflags=''
+ldflags='%%EXTRA_PERLLIBDIRS%%'
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
@@ -832,7 +832,7 @@ perl5=''
 perl=''
 perl_patchlevel=''
 perladmin='root@maia.dev.null'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
diff --git a/lang/perl/files/config.sh-mips.in b/lang/perl/files/config.sh-mips.in
index c261711ee..8058cead9 100644
--- a/lang/perl/files/config.sh-mips.in
+++ b/lang/perl/files/config.sh-mips.in
@@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/
 ksh=''
 ld='%%LD%%'
 lddlflags='-shared %%LDFLAGS%%'
-ldflags=''
+ldflags='%%EXTRA_PERLLIBDIRS%%'
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
@@ -832,7 +832,7 @@ perl5=''
 perl=''
 perl_patchlevel=''
 perladmin='root@merope.dev.null'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
diff --git a/lang/perl/files/config.sh-mipsel.in b/lang/perl/files/config.sh-mipsel.in
index f1ecfdc3d..0c9fd2fc2 100644
--- a/lang/perl/files/config.sh-mipsel.in
+++ b/lang/perl/files/config.sh-mipsel.in
@@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/
 ksh=''
 ld='%%LD%%'
 lddlflags='-shared %%LDFLAGS%%'
-ldflags=''
+ldflags='%%EXTRA_PERLLIBDIRS%%'
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
@@ -832,7 +832,7 @@ perl5=''
 perl=''
 perl_patchlevel=''
 perladmin='root@merope.dev.null'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
diff --git a/lang/perl/files/config.sh-powerpc.in b/lang/perl/files/config.sh-powerpc.in
index da84eeafb..e626586b2 100644
--- a/lang/perl/files/config.sh-powerpc.in
+++ b/lang/perl/files/config.sh-powerpc.in
@@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/
 ksh=''
 ld='%%LD%%'
 lddlflags='-shared %%LDFLAGS%%'
-ldflags=''
+ldflags='%%EXTRA_PERLLIBDIRS%%'
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
@@ -832,7 +832,7 @@ perl5=''
 perl=''
 perl_patchlevel=''
 perladmin='root@maia.dev.null'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%'
 perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
diff --git a/lang/perl/patches/100-static_uudmap.patch b/lang/perl/patches/100-static_uudmap.patch
index 698129a2c..e0821cc07 100644
--- a/lang/perl/patches/100-static_uudmap.patch
+++ b/lang/perl/patches/100-static_uudmap.patch
@@ -35,13 +35,12 @@
  
 -uudmap.h: generate_uudmap\$(EXE_EXT)
 -	\$(RUN) ./generate_uudmap\$(EXE_EXT) >uudmap.h
--
--generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT)
--	\$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs)
 +uudmap.h: generate_uudmap
 +	chmod a+x generate_uudmap
 +	\$(RUN) ./generate_uudmap >uudmap.h
-+
+ 
+-generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT)
+-	\$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs)
 +generate_uudmap:
 +	cp ../generate_uudmap .
 +	touch generate_uudmap