lang/perl: Clean up, add comments

Signed-off-by: Marcel Denia <[email protected]>

diff --git a/lang/perl/Makefile b/lang/perl/Makefile
index 32f89a71083079e5c220bfc206a6289a90ce37f7..cb4246f69e7cc5733ed4967e24fdbe9192cf7e89 100644 (file)
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@@ -26,20 +26,23 @@ PKG_LICENSE:=GPLv1 ARTISTIC
 PKG_LICENSE_FILES:=Copying Artistic README
 PKG_MAINTAINER:=Marcel Denia <[email protected]>
 
+# Build settings
 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL:=1
 PKG_BUILD_DEPENDS:=perl/host
 PKG_BUILD_PARALLEL:=1
 HOST_BUILD_PARALLEL:=1
 
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
+# Variables used during configuration/build
+HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
 ifneq ($(CONFIG_USE_EGLIBC),)
-EXTRA_LIBS:=bsd
-EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
+       EXTRA_LIBS:=bsd
+       EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
 endif
 
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
 define Package/perl
   SUBMENU:=Perl
   SECTION:=lang
@@ -55,17 +58,17 @@ define Package/perl/description
   and is widely used to program web applications of all needs.
 endef
 
-HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
+# Static host perl
 define Host/Configure
        ( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Dprefix=$(HOST_PERL_PREFIX) )
 endef
 
 define Host/Install
        ( cd $(HOST_BUILD_DIR); ./miniperl installperl )
-       #--destdir=$(STAGING_DIR_HOST)
        $(CP) $(HOST_BUILD_DIR)/generate_uudmap $(HOST_PERL_PREFIX)/bin/
 endef
 
+# Target perl
 define Build/Configure
        sed \
                -e 's!%%CC%%!$(TARGET_CC)!g' \
@@ -97,6 +100,7 @@ define Package/perl/install
        ln -nsf perl$(PKG_VERSION) $(1)/usr/bin/perl
 endef
 
+
 $(eval $(call RequireCommand,rsync, \
        $(PKG_NAME) requires rsync installed on the host-system. \
 ))

diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk
index 4b2a0f4b7bba0fb12a4f49ba00c52b5c59ad8a18..ab2f4fedaad015f24f79937b4ce28b19fd234df9 100644 (file)
--- a/lang/perl/perlmod.mk
+++ b/lang/perl/perlmod.mk
@@ -3,6 +3,10 @@
 
 # Build environment
 HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
+ifneq ($(CONFIG_USE_EGLIBC),)
+       EXTRA_LIBS:=bsd
+       EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
+endif
 PERL_CMD:=$(STAGING_DIR_HOST)/usr/bin/perl5.20.0
 
 # Module install prefix
@@ -24,7 +28,7 @@ define perlmod/Configure
                FULL_AR=$(GNU_TARGET_NAME)-ar \
                LD=$(GNU_TARGET_NAME)-gcc \
                LDDLFLAGS="-shared $(TARGET_LDFLAGS)"  \
-               LDFLAGS=" " \
+               LDFLAGS="$(EXTRA_LIBDIRS:%=-L%) $(EXTRA_LIBS:%=-l%) " \
                LIBC=" " \
                LIB_EXT=.a \
                OBJ_EXT=.o \