X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fperl;h=0c239318c3915cdfbad3ff602b075bb425513bf3;hb=c19196e1c51d2a5a3a2a762e8d81c253dd5dd79d;hp=61c8ef113b4b1443c7943a3aee048865ee3e100b;hpb=9ccc03bf9dd0ed64ad4bc8e1728c35dae59c55bf;p=ipfire-2.x.git

diff --git a/lfs/perl b/lfs/perl
index 61c8ef113b..0c239318c3 100644
--- a/lfs/perl
+++ b/lfs/perl
@@ -31,7 +31,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
@@ -77,9 +77,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/perl-Fix-Errno.pm-generation-for-gcc-5.0.patch
 ifneq "$(ROOT)" ""
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-libc-2.patch
 endif
+	cd $(DIR_APP) && sed -i -e 's|-fstack-protector|-fno-stack-protector|g' Configure
 ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 -Dpager="/usr/bin/less -isR" -Dusethreads
@@ -88,14 +90,13 @@ ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 else
-	cd $(DIR_APP) && sed -i -e 's|-fstack-protector|-fno-stack-protector|g' Configure
-	cd $(DIR_APP) && ./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper Fcntl IO'
+	cd $(DIR_APP) && ./configure.gnu --prefix=$(TOOLS_DIR) -Dstatic_ext='Data/Dumper Fcntl IO'
 	cd $(DIR_APP) && sed -i 's/^0$$//' makefile
 	cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
 	cd $(DIR_APP) && make perl utilities
-	cd $(DIR_APP) && cp -v perl pod/pod2man /tools/bin
-	cd $(DIR_APP) && mkdir -pv /tools/lib/perl5/$(VER)
-	cd $(DIR_APP) && cp -Rv lib/* /tools/lib/perl5/$(VER)
+	cd $(DIR_APP) && cp -v perl pod/pod2man $(TOOLS_DIR)/bin
+	cd $(DIR_APP) && mkdir -pv $(TOOLS_DIR)/lib/perl5/$(VER)
+	cd $(DIR_APP) && cp -Rv lib/* $(TOOLS_DIR)/lib/perl5/$(VER)
 endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)