summaryrefslogtreecommitdiff
path: root/mk/package.mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:03:20 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-07 20:03:20 +0100
commit6daa792eab1488d013fefc5eb7e4d01f40f38687 (patch)
tree6391cc46bb9fc8b859d99175ea317e5fa7b37959 /mk/package.mk
parentadcaca72539b2ff4a5f4deee00d5f0251378ac9b (diff)
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.
Diffstat (limited to 'mk/package.mk')
-rw-r--r--mk/package.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/package.mk b/mk/package.mk
index 50f5ecb61..dbf383c8b 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -54,7 +54,6 @@ CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \
else
CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
${HOST_CONFIGURE_OPTS} \
- CC='${TARGET_CC}' CXX='${TARGET_CXX}' \
CFLAGS='$(strip ${TCFLAGS})' \
CXXFLAGS='$(strip ${TCXXFLAGS})' \
CPPFLAGS='$(strip ${TCPPFLAGS})' \
@@ -65,6 +64,7 @@ CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
ac_cv_func_realloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes
endif
+CONFIGURE_PROG?= configure
MAKE_FILE?= Makefile
# this is environment for 'make all' and 'make install'
MAKE_ENV?=
@@ -91,15 +91,19 @@ MAKE_ENV+= PATH='${TARGET_PATH}' \
WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \
PKG_CONFIG_LIBDIR=/dev/null \
- CC='${TARGET_CC}' CXX='${TARGET_CXX}' \
- AR='${TARGET_CROSS}ar' RANLIB='${TARGET_CROSS}ranlib' \
+ CC='${TARGET_CC}' \
+ CXX='${TARGET_CXX}' \
+ AR='${TARGET_CROSS}ar' \
+ RANLIB='${TARGET_CROSS}ranlib' \
NM='${TARGET_CROSS}nm' \
+ STRIP='${TARGET_CROSS}strip' \
+ CROSS="$(TARGET_CROSS)" \
CFLAGS='$(strip ${TCFLAGS})' \
CXXFLAGS='$(strip ${TCXXFLAGS})' \
CPPFLAGS='$(strip ${TCPPFLAGS})' \
LDFLAGS='$(strip ${TLDFLAGS})'
endif
-MAKE_FLAGS+= ${XAKE_FLAGS}
+MAKE_FLAGS+= ${XAKE_FLAGS} V=1
FAKE_FLAGS+= ${XAKE_FLAGS}
ifeq ($(strip ${WRKDIR_BSD}),)