diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/nss | |
parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/nss')
4 files changed, 46 insertions, 3 deletions
diff --git a/package/nss/Makefile b/package/nss/Makefile index 4a57e4218..75b6332a3 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -14,7 +14,7 @@ PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_8_RTM/src/ PKG_NOPARALLEL:= 1 -PKG_HOST_DEPENDS:= !cygwin +PKG_HOST_DEPENDS:= !cygwin !darwin PKG_TARGET_DEPENDS:= !foxboard WRKSRC= ${WRKDIST}/mozilla/security/nss @@ -33,12 +33,13 @@ endif MAKE_FLAGS+= NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}" TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr TCFLAGS+= -I${STAGING_DIR}/usr/include/nspr -TLDFLAGS:= '' +#TLDFLAGS:= '' +TLDFLAGS+= -ldl XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl" ALL_TARGET:= build_coreconf all -XAKE_FLAGS+= OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 +XAKE_FLAGS+= OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib diff --git a/package/nss/patches/patch-mozilla_security_coreconf_command_mk b/package/nss/patches/patch-mozilla_security_coreconf_command_mk new file mode 100644 index 000000000..518b2e5ea --- /dev/null +++ b/package/nss/patches/patch-mozilla_security_coreconf_command_mk @@ -0,0 +1,11 @@ +--- nss-3.12.8.orig/mozilla/security/coreconf/command.mk 2007-10-23 23:55:00.000000000 +0200 ++++ nss-3.12.8/mozilla/security/coreconf/command.mk 2010-10-12 14:44:35.000000000 +0200 +@@ -48,7 +48,7 @@ LINK_EXE = $(LINK) $(OS_LFLAGS) $(L + CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ + $(XCFLAGS) + PERL = perl +-RANLIB = echo ++RANLIB = ranlib + TAR = /bin/tar + # + # For purify diff --git a/package/nss/patches/patch-mozilla_security_coreconf_rules_mk b/package/nss/patches/patch-mozilla_security_coreconf_rules_mk new file mode 100644 index 000000000..d58086f58 --- /dev/null +++ b/package/nss/patches/patch-mozilla_security_coreconf_rules_mk @@ -0,0 +1,20 @@ +--- nss-3.12.8.orig/mozilla/security/coreconf/rules.mk 2010-04-26 01:37:40.000000000 +0200 ++++ nss-3.12.8/mozilla/security/coreconf/rules.mk 2010-10-03 23:41:05.000000000 +0200 +@@ -281,7 +281,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: +@@ -338,7 +338,7 @@ ifdef MT + endif # MSVC with manifest tool + endif + else +- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) ++ $(MKSHLIB) -o $@ $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) + chmod +x $@ + ifeq ($(OS_TARGET),Darwin) + ifdef MAPFILE diff --git a/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c b/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c new file mode 100644 index 000000000..111203785 --- /dev/null +++ b/package/nss/patches/patch-mozilla_security_nss_lib_freebl_stubs_c @@ -0,0 +1,11 @@ +--- nss-3.12.8.orig/mozilla/security/nss/lib/freebl/stubs.c 2010-04-29 02:17:52.000000000 +0200 ++++ nss-3.12.8/mozilla/security/nss/lib/freebl/stubs.c 2010-10-03 23:19:08.000000000 +0200 +@@ -530,7 +530,7 @@ freebl_InitNSSUtil(void *lib) + * fetch the library if it's loaded. For NSS it should already be loaded + */ + #define freebl_getLibrary(libName) \ +- dlopen (libName, RTLD_LAZY|RTLD_NOLOAD) ++ dlopen (libName, RTLD_LAZY) + + #define freebl_releaseLibrary(lib) \ + if (lib) dlclose(lib) |