From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/nspr/Makefile | 3 --- package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in | 11 +++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in (limited to 'package/nspr') diff --git a/package/nspr/Makefile b/package/nspr/Makefile index f06b9564a..4a5fe323b 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -21,9 +21,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ENV+= HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto 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 new file mode 100644 index 000000000..40d15376f --- /dev/null +++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in @@ -0,0 +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 +@@ -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)$@ + + install:: nspr.m4 + $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal -- cgit v1.2.3