diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-05-27 17:19:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-05-27 17:19:33 +0200 |
| commit | 9a841e2aed7b7e52958e5703215643dd3cf45ad0 (patch) | |
| tree | 58b5a13611e2450d6f88eae256b43e3d6cbd5356 /package/nspr | |
| parent | c12b595892e3231182239998f6561bd6556a9947 (diff) | |
| parent | 23eff1d5d3d4f22fc3d2fe9de026e3df3edf426d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/nspr')
| -rw-r--r-- | package/nspr/Makefile | 7 | ||||
| -rw-r--r-- | package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in | 4 | ||||
| -rw-r--r-- | package/nspr/patches/patch-mozilla_nsprpub_configure | 21 |
3 files changed, 29 insertions, 3 deletions
diff --git a/package/nspr/Makefile b/package/nspr/Makefile index 9072977a1..9383c8c5f 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -20,7 +20,12 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" +CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ + cross_compiling=yes + +ifeq (${ADK_LINUX_64},y) +CONFIGURE_ARGS+= --enable-64bit +endif post-install: $(INSTALL_DIR) $(IDIR_NSPR)/usr/lib diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in index 40d15376f..f667eeb61 100644 --- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in +++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in @@ -1,11 +1,11 @@ --- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in 2009-03-03 23:04:23.000000000 +0100 -+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-02-06 02:01:27.321836181 +0100 ++++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-05-02 12:25:27.673464050 +0200 @@ -145,7 +145,7 @@ endif $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) - $(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ -+ $(CC_FOR_BUILD) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ ++ $(CC_FOR_BUILD) $(HOSTCFLAGS) $< $(HOSTLDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ install:: nspr.m4 $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure new file mode 100644 index 000000000..3d048970b --- /dev/null +++ b/package/nspr/patches/patch-mozilla_nsprpub_configure @@ -0,0 +1,21 @@ +--- nspr-4.8.2.orig/mozilla/nsprpub/configure 2009-10-04 02:57:00.000000000 +0200 ++++ nspr-4.8.2/mozilla/nsprpub/configure 2010-05-02 12:55:21.842224375 +0200 +@@ -1129,8 +1129,8 @@ EOF + fi + + if test -z "$SKIP_COMPILER_CHECKS"; then +-if test "$target" != "$host"; then +- echo "cross compiling from $host to $target" ++if test "$target" != "$build"; then ++ echo "cross compiling from $build to $target" + cross_compiling=yes + + _SAVE_CC="$CC" +@@ -2593,6 +2593,7 @@ case "$build:$target" in + ;; + esac + ++cross_compiling=yes + if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 + else |