diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 2 | ||||
| -rw-r--r-- | patches/apr_util-1.6.1.local.patch | 16 | ||||
| -rw-r--r-- | subr/pkg_clean.subr | 3 | ||||
| -rw-r--r-- | vars/env.vars | 9 |
4 files changed, 9 insertions, 21 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index 882b52cd..b758c57d 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -20,10 +20,12 @@ zstd"; : ${PKG_APR_SHA256SUM:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105}; : ${PKG_APR_VERSION:=1.6.5}; : ${PKG_APR_URL:=http://ftp.fau.de/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2}; +: ${PKG_APR_NO_CLEAN:=1}; : ${PKG_APR_UTIL_DEPENDS:="apr sqlite3"}; : ${PKG_APR_UTIL_SHA256SUM:=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b}; : ${PKG_APR_UTIL_VERSION:=1.6.1}; : ${PKG_APR_UTIL_URL:=https://archive.apache.org/dist/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2}; +: ${PKG_APR_UTIL_ENV_VARS_EXTRA:="LDADD_dbd_sqlite3=-lsqlite3 -lapr-1 -L.libs -laprutil-1"}; : ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"}; : ${PKG_APR_UTIL_INSTALL_FILES:=bin/apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config}; : ${PKG_BDWGC_DEPENDS:="libatomic_ops"}; diff --git a/patches/apr_util-1.6.1.local.patch b/patches/apr_util-1.6.1.local.patch deleted file mode 100644 index 86c0ea6b..00000000 --- a/patches/apr_util-1.6.1.local.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- apr-util-1.6.0/configure.orig 2017-05-04 01:16:59.000000000 +0200 -+++ apr-util-1.6.0/configure 2017-08-03 16:28:21.653082936 +0200 -@@ -20794,10 +20794,10 @@ - if test "$apu_have_sqlite3" = "1"; then - - if test "x$LDADD_dbd_sqlite3" = "x"; then -- test "x$silent" != "xyes" && echo " setting LDADD_dbd_sqlite3 to \"$sqlite3_LDFLAGS -lsqlite3\"" -- LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3" -+ test "x$silent" != "xyes" && echo " setting LDADD_dbd_sqlite3 to \"$sqlite3_LDFLAGS -lsqlite3 -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1\"" -+ LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3 -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1" - else -- apr_addto_bugger="$sqlite3_LDFLAGS -lsqlite3" -+ apr_addto_bugger="$sqlite3_LDFLAGS -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1 -lsqlite3" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $LDADD_dbd_sqlite3; do diff --git a/subr/pkg_clean.subr b/subr/pkg_clean.subr index 71a025c5..f9f9a204 100644 --- a/subr/pkg_clean.subr +++ b/subr/pkg_clean.subr @@ -4,6 +4,9 @@ pkg_clean() { local _dir=""; + if [ -n "${PKG_NO_CLEAN}" ]; then + return 0; + fi; if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" , build; then ex_rtl_fileop rm "${PKG_BUILD_DIR}"; fi; diff --git a/vars/env.vars b/vars/env.vars index 6e6b0dd9..64728b6c 100644 --- a/vars/env.vars +++ b/vars/env.vars @@ -25,11 +25,10 @@ DEFAULT_BUILD_VARS=" LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA \ LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \ MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL \ - MAKEFLAGS_INSTALL_EXTRA NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON \ - PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_PATH PKGLIST_DISABLE PREFIX \ - RANLIB RPM_DISABLE SHA256SUM SRC_TARBALL_DISABLE SUBDIR TARGET \ - URL URL_TYPE URLS_GIT VERSION"; - + MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS \ + PYTHON PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_PATH PKGLIST_DISABLE \ + PREFIX RANLIB RPM_DISABLE SHA256SUM SRC_TARBALL_DISABLE SUBDIR \ + TARGET URL URL_TYPE URLS_GIT VERSION"; # Path names : ${PREFIX_ROOT:=${HOME}/midipix}; |