fix uclibc build

5 files changed, 52 insertions, 5 deletions

diff --git a/package/nss/Makefile b/package/nss/Makefile
index 943d4b136..e3867d0fa 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		nss
 PKG_VERSION:=		3.15.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MAJ_VERSION:=	3
 PKG_MIN_VERSION:=	15
 PKG_PATCH_VERSION:=	2
@@ -28,6 +28,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,NSS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 ifneq ($(ADK_LINUX_64),)
 ifeq ($(ADK_LINUX_MIPS),y)
@@ -48,7 +49,7 @@ XAKE_FLAGS+=		ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" NSS_USE_
 XAKE_FLAGS+=		NSS_USE_SYSTEM_ZLIB=1
 ALL_TARGET:=		all
 
-post-install:
+do-install:
 	$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
 	${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{nsssysinit,nssckbi,freebl3,ssl3,smime3,nss3,nssutil3,softokn3}.so \
 		$(IDIR_NSS)/usr/lib
diff --git a/package/nss/patches/patch-nss_cmd_shlibsign_sign_sh b/package/nss/patches/patch-nss_cmd_shlibsign_sign_sh
new file mode 100644
index 000000000..4f3c535cb
--- /dev/null
+++ b/package/nss/patches/patch-nss_cmd_shlibsign_sign_sh
@@ -0,0 +1,12 @@
+--- nss-3.15.2.orig/nss/cmd/shlibsign/sign.sh	2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/cmd/shlibsign/sign.sh	2013-10-11 15:18:48.000000000 +0200
+@@ -45,7 +45,7 @@ WIN*)
+     export LIBRARY_PATH
+     ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
+     export ADDON_PATH
+-    echo "${2}"/shlibsign -v -i "${5}"
+-    "${2}"/shlibsign -v -i "${5}"
++    #echo "${2}"/shlibsign -v -i "${5}"
++    #"${2}"/shlibsign -v -i "${5}"
+     ;;
+ esac
diff --git a/package/nss/patches/patch-nss_coreconf_nsinstall_Makefile b/package/nss/patches/patch-nss_coreconf_nsinstall_Makefile
new file mode 100644
index 000000000..251a628b1
--- /dev/null
+++ b/package/nss/patches/patch-nss_coreconf_nsinstall_Makefile
@@ -0,0 +1,23 @@
+--- nss-3.15.2.orig/nss/coreconf/nsinstall/Makefile	2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/nsinstall/Makefile	2013-10-11 16:12:45.000000000 +0200
+@@ -18,19 +18,14 @@ INTERNAL_TOOLS  = 1
+ 
+ include $(DEPTH)/coreconf/config.mk
+ 
+-ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+-PROGRAM		=
+-else
+-TARGETS		= $(PROGRAM)
+ INSTALL		= true
+-endif
+ 
+ ifdef NATIVE_CC
+ CC=$(NATIVE_CC)
+ endif
+ 
+ ifdef NATIVE_FLAGS
+-OS_CFLAGS=$(NATIVE_FLAGS)
++CFLAGS=$(NATIVE_FLAGS)
+ endif
+ 
+ include $(DEPTH)/coreconf/rules.mk
diff --git a/package/nss/patches/patch-nss_coreconf_rules_mk b/package/nss/patches/patch-nss_coreconf_rules_mk
new file mode 100644
index 000000000..ff1485df4
--- /dev/null
+++ b/package/nss/patches/patch-nss_coreconf_rules_mk
@@ -0,0 +1,11 @@
+--- nss-3.15.2.orig/nss/coreconf/rules.mk	2013-09-25 15:57:55.000000000 +0200
++++ nss-3.15.2/nss/coreconf/rules.mk	2013-10-11 14:55:04.000000000 +0200
+@@ -249,7 +249,7 @@ ifdef MT
+ 	fi
+ endif	# MSVC with manifest tool
+ else
+-	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ endif
+ 
+ get_objs:
diff --git a/package/nss/src/nss/config/Makefile b/package/nss/src/nss/config/Makefile
index d80816b60..1a913987b 100644
--- a/package/nss/src/nss/config/Makefile
+++ b/package/nss/src/nss/config/Makefile
@@ -8,10 +8,10 @@ NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
 NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
 PREFIX = /usr
 
-all: install libs
+all: libs
 
 export:
-install:
+libs:
 	# Create the nss.pc file
 	mkdir -p $(DIST)/lib/pkgconfig
 	sed -e "s,@prefix@,$(PREFIX)," \
@@ -35,7 +35,7 @@ install:
 	chmod 0755 nss-config
 	cp nss-config $(DIST)/bin
 
-libs:
+install:
 
 dummy: all export install libs