Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 43 insertions, 13 deletions

diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index ac12a8662..20bb4b1a2 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.9
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		18869d16db3f49c053f8c68eba3fe2e0
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
index d6b448e59..6ff8efbf8 100644
--- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -1,5 +1,5 @@
 --- nfs-utils-1.2.9.orig/tools/rpcgen/Makefile.in	2013-11-05 21:58:16.000000000 +0100
-+++ nfs-utils-1.2.9/tools/rpcgen/Makefile.in	2014-02-19 20:12:32.000000000 +0100
++++ nfs-utils-1.2.9/tools/rpcgen/Makefile.in	2014-02-21 17:06:36.000000000 +0100
 @@ -119,8 +119,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
  am__v_lt_1 = 
@@ -11,6 +11,15 @@
  AM_V_P = $(am__v_P_@AM_V@)
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  am__v_P_0 = false
+@@ -187,7 +187,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALLOCA = @ALLOCA@
+ AMTAR = @AMTAR@
+ AM_CFLAGS = @AM_CFLAGS@
+-AM_CPPFLAGS = @AM_CPPFLAGS@
++AM_CPPFLAGS = 
+ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
 @@ -197,7 +197,7 @@ AWK = @AWK@
  CC = $(CC_FOR_BUILD)
  CCDEPMODE = @CCDEPMODE@
diff --git a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
index 36e7b6c29..7cb0c4ca0 100644
--- a/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
+++ b/package/nfs-utils/patches/patch-utils_mountd_fsloc_c
@@ -1,6 +1,6 @@
---- nfs-utils-1.2.8.orig/utils/mountd/fsloc.c	2013-04-22 18:47:20.000000000 +0200
-+++ nfs-utils-1.2.8/utils/mountd/fsloc.c	2013-08-13 10:57:48.000000000 +0200
-@@ -127,7 +127,7 @@ static struct servers *method_list(char
+--- nfs-utils-1.2.9.orig/utils/mountd/fsloc.c	2013-11-05 21:41:27.000000000 +0100
++++ nfs-utils-1.2.9/utils/mountd/fsloc.c	2014-02-21 17:01:23.000000000 +0100
+@@ -127,7 +127,7 @@ static struct servers *method_list(char 
  	bool v6esc = false;
  
  	xlog(L_NOTICE, "method_list(%s)", data);
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index b364b368f..027a74611 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -45,6 +45,10 @@ ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),)
 OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
 endif
 
+ifeq ($(ADK_LINUX_MICROBLAZE),y)
+TARGET_CFLAGS:=		$(subst g3,g,$(TARGET_CFLAGS))
+endif
+
 ifeq ($(ADK_LINUX_X86_64),y)
 CONFIG:=		linux-embedded-x86_64
 TARGET_CFLAGS:=		$(subst g3,g,$(TARGET_CFLAGS))
diff --git a/package/perl/Makefile b/package/perl/Makefile
index d42e2d356..72b395e1e 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		lang
 PKG_BUILDDEP:=		perl-host
 PKG_URL:=		http://www.perl.org/
 PKG_SITES:=		http://www.cpan.org/src/
+PKG_NOPARALLEL:=	1
 
 include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
@@ -28,15 +29,21 @@ INSTALL_STYLE:=		manual
 TARGET_CFLAGS:=		$(subst g3,g,$(TARGET_CFLAGS))
 
 host-configure:
-	(cd ${WRKBUILD}; ./Configure -der -Uusedl)
+	$(SED) "s#@@STAGING_HOST_DIR@@/perl-host#./perl#" ${WRKBUILD}/Makefile.SH 
+	$(SED) "s#@@LIB@@#-Ilib#" ${WRKBUILD}/Makefile.SH 
+	# darwin workaround
+	$(SED) "s#^usedl.*##" ${WRKBUILD}/hints/darwin.sh
+	(cd ${WRKBUILD}; ${BASH} ./Configure -des -Duseperlio -Uusedl -Uusethreads -Uuseshrplib -Dprefix=${STAGING_HOST_DIR}/usr)
 
 host-build:
 	cd ${WRKBUILD} && env CC_FOR_BUILD="gcc" ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 		${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE)
 
 perl-hostinstall:
-	$(CP) ${WRKBUILD}/miniperl $(STAGING_HOST_DIR)/usr/bin
-	$(CP) ${WRKBUILD}/perl $(STAGING_HOST_DIR)/usr/bin/perl.host
+	cd ${WRKBUILD} && env CC_FOR_BUILD="gcc" ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+		${HOST_MAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
+	mv ${STAGING_HOST_DIR}/usr/bin/perl ${STAGING_HOST_DIR}/usr/bin/perl-host
+	cp ${WRKBUILD}/miniperl ${STAGING_HOST_DIR}/usr/bin
 
 do-configure:
 	sed \
@@ -50,6 +57,8 @@ do-configure:
 		-e 's!%%LIBDIRS%%!$(STAGING_TARGET_DIR)/lib $(STAGING_TARGET_DIR)/usr/lib!g' \
 		-e 's!%%INCDIRS%%!$(STAGING_TARGET_DIR)/include $(STAGING_TARGET_DIR)/usr/include!g' \
 		./files/config.sh.$(CPU_ARCH).$(ADK_TARGET_LIBC) > ${WRKBUILD}/config.sh
+	$(SED) "s#@@STAGING_HOST_DIR@@#${STAGING_HOST_DIR}/usr/bin#" ${WRKBUILD}/Makefile.SH 
+	$(SED) "s#@@LIB@@##" ${WRKBUILD}/Makefile.SH 
 	(cd ${WRKBUILD}; ./Configure -S)
 
 do-build:
@@ -60,8 +69,7 @@ do-build:
 	(cd ${WRKBUILD}; $(MAKE))
 
 do-install:
-	(cd ${WRKBUILD}; $(CP) miniperl.target miniperl)
-	(cd ${WRKBUILD}; $(STAGING_HOST_DIR)/usr/bin/perl.host installperl --destdir=${WRKINST})
+	(cd ${WRKBUILD}; $(STAGING_HOST_DIR)/usr/bin/perl-host installperl --destdir=${WRKINST})
 
 perl-install:
 	${INSTALL_DIR} ${IDIR_PERL}/usr/bin
diff --git a/package/perl/patches/patch-Makefile_SH b/package/perl/patches/patch-Makefile_SH
index cb947405f..9784baab2 100644
--- a/package/perl/patches/patch-Makefile_SH
+++ b/package/perl/patches/patch-Makefile_SH
@@ -1,5 +1,14 @@
 --- perl-5.18.1.orig/Makefile.SH	2013-08-12 04:44:47.000000000 +0200
-+++ perl-5.18.1/Makefile.SH	2013-12-31 14:09:47.000000000 +0100
++++ perl-5.18.1/Makefile.SH	2014-02-18 16:20:59.000000000 +0100
+@@ -319,7 +319,7 @@ MINIPERL = \$(LDLIBPTH) \$(RUN) ./minipe
+ 
+ # Macros to invoke a copy of our fully operational perl during the build.
+ PERL_EXE = perl\$(EXE_EXT)
+-RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT)
++RUN_PERL = \$(LDLIBPTH) \$(RUN) @@STAGING_HOST_DIR@@/perl-host\$(EXE_EXT)
+ 
+ # Macros to run our tests
+ RUN_TESTS = \$(LDLIBPTH) ./runtests
 @@ -665,9 +665,10 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
  	$(RUN) ./generate_uudmap$(HOST_EXE_EXT) $(generated_headers)
  
@@ -8,7 +17,7 @@
  
  generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
 -	$(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs)
-+	$(CC_FOR_BUILD) -o generate_uudmap$(EXE_EXT) generate_uudmap$(OBJ_EXT) $(libs)
++	$(CC_FOR_BUILD) -o generate_uudmap$(EXE_EXT) generate_uudmap$(OBJ_EXT)
  
  miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
  	$(CCCMD) $(PLDLFLAGS) $*.c
@@ -25,7 +34,7 @@
  # them, which picks up Devel::PPPort's documentation.
  pod/perltoc.pod: $(perltoc_pod_prereqs)  $(PERL_EXE) $(ext) pod/buildtoc
 -	$(RUN_PERL) -f -Ilib pod/buildtoc -q
-+	#$(RUN_PERL) -f -Ilib pod/buildtoc -q
++	$(RUN_PERL) -f @@LIB@@ pod/buildtoc -q
  
  pod/perlapi.pod: pod/perlintern.pod