Before I spend a lot of time perfecting this fix (since the return-on-investment for patches lately is a bit low), I'm not convinced that having to apply a similar tweak to all of the files/config.sh-XXX.in files.
Would it make more sense to do: -e 's!^(libs=\'[^\']*)\'$$!\1$(EXTRA_LIBS:%=-l%)\!g' \ instead of: -e 's!%%EXTRA_PERLLIBS%%!$(EXTRA_LIBS:%=-l%)!g' \ it just seems that having to modify N files each time we make a change to a field seems like a lot of useless work.
Index: feeds/packages/lang/perl/Makefile =================================================================== --- feeds/packages/lang/perl/Makefile (revision 27246) +++ feeds/packages/lang/perl/Makefile (working copy) @@ -22,12 +22,18 @@ 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 @@ -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) Index: feeds/packages/lang/perl/files/config.sh-i486.in =================================================================== --- feeds/packages/lang/perl/files/config.sh-i486.in (revision 27246) +++ feeds/packages/lang/perl/files/config.sh-i486.in (working copy) @@ -735,7 +735,7 @@ ksh='' ld='%%LD%%' lddlflags='-shared %%LDFLAGS%%' -ldflags='' +ldflags='%%EXTRA_PERLLIBDIRS%%' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' @@ -832,7 +832,7 @@ perl='' perl_patchlevel='' perladmin='[email protected]' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%' perlpath='/usr/bin/perl' pg='pg' phostname='hostname'
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
