diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
commit | 070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (patch) | |
tree | 1a4cf65e381c5ce777316fb67e69018feb741f8f /package/nss/Makefile | |
parent | d82534d3a6bfb048cc7bdc694654c15a975d7af6 (diff) | |
parent | 644de656b41be3def5d2d0f276f7e24c0b367ea1 (diff) |
resolve conflict
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/build.mk
Diffstat (limited to 'package/nss/Makefile')
-rw-r--r-- | package/nss/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/nss/Makefile b/package/nss/Makefile index e3011eebb..48022d2f2 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -31,10 +31,10 @@ TLDFLAGS:= '' BUILD_STYLE:= auto INSTALL_STYLE:= auto -MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist NSS_DISABLE_DBM=1 OS_TEST=${ARCH} \ - ARCHFLAG="${TCFLAGS} ${TCPPFLAGS}" +MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ + ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl" ALL_TARGET:= build_coreconf all -XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 +XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib |