projects / openwrt / svn-archive / archive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3fbccac)
[packages] perl: link with libbsd for (e)glibc, refresh patches, Signed-off-by: Phili...
authorStephen Walker <stephendwalker@gmail.com>
Thu, 14 Jul 2011 18:38:34 +0000 (18:38 +0000)
committerStephen Walker <stephendwalker@gmail.com>
Thu, 14 Jul 2011 18:38:34 +0000 (18:38 +0000)
SVN-Revision: 27611

lang/perl/Makefile patch | blob | history
lang/perl/files/config.sh-arm.in patch | blob | history
lang/perl/files/config.sh-armeb.in patch | blob | history
lang/perl/files/config.sh-avr32.in patch | blob | history
lang/perl/files/config.sh-i486.in patch | blob | history
lang/perl/files/config.sh-mips.in patch | blob | history
lang/perl/files/config.sh-mipsel.in patch | blob | history
lang/perl/files/config.sh-powerpc.in patch | blob | history
lang/perl/patches/100-static_uudmap.patch patch | blob | history

diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index dd0fc06d889dd9b5acab7188ec06c73113a819d0..72873fa3f99fdf13c84b6e19c4ed9c83a90062e3 100644 (file)
--- 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 ae87c592a31a000fa7c869c8715a2bb8a3b42d56..a21991faf4e7840a0c9c046b7c76c4ea2342d81e 100644 (file)
--- 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 ced3b72953e11029604ce2606d6c8b8a01a21a4c..81bc555ef3c52183886daa48af9281718b9f9db7 100644 (file)
--- 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 d7f148dcbf965ae281bd0b656645fdb1eb5c3bf5..1108364d5441187889246d9d04c664c862028822 100644 (file)
--- 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 2cb2b526906afef3bb6986ffbb8f8e478115a22f..d05fdd0fffa4a890d2885b0a36c61100a65ddaf1 100644 (file)
--- 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 c261711ee861a6fc090645e50aed00c7da5fa848..8058cead9d0eb99c8fe3ae9ec69a277c6e8268cf 100644 (file)
--- 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 f1ecfdc3def20b4bd5db9d07d632ad2340a04fb5..0c9fd2fc2828a34df5bb037323ab1c163b21fdb1 100644 (file)
--- 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 da84eeafb3fa1d8d825298dd45e6ea1a5e5b7d88..e626586b27ff81aefa1d5d6deafe177fa29737b2 100644 (file)
--- 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 698129a2cfbeeb93206bc3a450d00b313fefea91..e0821cc0718b8a247e50594711412fec741d5979 100644 (file)
--- 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
OpenWrt SVN history