[packages] perl: link with libbsd for (e)glibc, refresh patches, Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
git-svn-id: svn://svn.openwrt.org/openwrt/packages@27611 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
f73d56edc4
commit
afb0dd4541
@ -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)
|
||||
|
@ -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'
|
||||
|
@ -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'
|
||||
|
@ -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'
|
||||
|
@ -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'
|
||||
|
@ -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'
|
||||
|
@ -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'
|
||||
|
@ -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'
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user