4cc1cf
vars/build.vars:apr{,_util}: explicitly mark dependency.
|
@@ -4,6 +4,9 @@
|
|
|
4
4
|
|
|
5
5
|
pkg_clean() {
|
|
6
6
|
local _dir;
|
|
7
|
+
if [ -n "${PKG_DEPS_BASE}" ]; then
|
|
8
|
+
return 0;
|
|
9
|
+
fi;
|
|
7
10
|
for _dir in ${ARG_CLEAN_BUILDS}; do
|
|
8
11
|
case "${_dir}" in
|
|
9
12
|
build) ex_rtl_fileop rm "${PKG_BUILD_DIR}"; ;;
|
|
@@ -345,10 +345,12 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
|
|
|
345
345
|
: ${PKG_APR_SHA256SUM:=131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172};
|
|
346
346
|
: ${PKG_APR_VERSION:=1.6.3};
|
|
347
347
|
: ${PKG_APR_URL:=http://mirror.yannic-bonenberger.com/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
|
|
348
|
+
: ${PKG_APR_DEPS_BASE:=apr_util};
|
|
348
349
|
: ${PKG_APR_UTIL_SHA256SUM:=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b};
|
|
349
350
|
: ${PKG_APR_UTIL_VERSION:=1.6.1};
|
|
350
351
|
: ${PKG_APR_UTIL_URL:=http://apache.lauf-forum.at/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
|
|
351
352
|
: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
|
|
353
|
+
: ${PKG_APR_UTIL_DEPS_PARENT:=apr};
|
|
352
354
|
: ${PKG_APR_UTIL_INSTALL_FILES:=apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
|
|
353
355
|
: ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd};
|
|
354
356
|
: ${PKG_BZIP2_VERSION:=1.0.6};
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
DEFAULT_BUILD_STEPS="
|
|
2
|
-
fetch_wget fetch_git fetch_extract fetch
|
|
3
|
-
configure_patch_pre configure_autotools configure_patch configure
|
|
4
|
-
build
|
|
5
|
-
install_subdirs install_make install_files install_libs
|
|
2
|
+
fetch_wget fetch_git fetch_extract fetch \
|
|
3
|
+
configure_patch_pre configure_autotools configure_patch configure \
|
|
4
|
+
build \
|
|
5
|
+
install_subdirs install_make install_files install_libs \
|
|
6
6
|
install_pkgconfig install_purge_la install_strip install clean";
|
|
7
7
|
DEFAULT_BUILD_VARS="
|
|
8
|
-
AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC
|
|
9
|
-
CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA
|
|
10
|
-
CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIGURE
|
|
11
|
-
CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA \
|
|
12
|
-
DISABLED ENV_VARS_EXTRA FNAME INHERIT_FROM INSTALL_FILES INSTALL_FILES
|
|
13
|
-
DESTDIR INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET
|
|
14
|
-
INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE
|
|
15
|
-
LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME
|
|
16
|
-
MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA
|
|
17
|
-
NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON PARALLELISE PATCHES_EXTRA PKG_CONFIG
|
|
8
|
+
AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC \
|
|
9
|
+
CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA \
|
|
10
|
+
CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIGURE \
|
|
11
|
+
CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA DEPS_BASE \
|
|
12
|
+
DEPS_PARENT DISABLED ENV_VARS_EXTRA FNAME INHERIT_FROM INSTALL_FILES INSTALL_FILES \
|
|
13
|
+
DESTDIR INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET \
|
|
14
|
+
INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \
|
|
15
|
+
LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \
|
|
16
|
+
MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA \
|
|
17
|
+
NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON PARALLELISE PATCHES_EXTRA PKG_CONFIG \
|
|
18
18
|
PKG_CONFIG_LIBDIR PKGCONFIG PREFIX RANLIB SHA256SUM SUBDIR TARGET URL
|
|
19
19
|
URL_TYPE URLS_GIT VERSION";
|
|
20
20
|
DEFAULT_LOG_MSG_FAIL_COLOUR=91;
|