diff options
| -rw-r--r-- | subr/pkg_configure_autotools.subr | 7 | ||||
| -rw-r--r-- | vars/apr.vars | 8 | ||||
| -rw-r--r-- | vars/bash.vars | 15 | ||||
| -rw-r--r-- | vars/bison.vars | 9 | ||||
| -rw-r--r-- | vars/build.vars | 18 | ||||
| -rw-r--r-- | vars/env.vars | 2 | ||||
| -rw-r--r-- | vars/gdk.vars | 3 | ||||
| -rw-r--r-- | vars/git.vars | 4 | ||||
| -rw-r--r-- | vars/glib.vars | 8 | ||||
| -rw-r--r-- | vars/gnulib.vars (renamed from etc/config.cache) | 91 | ||||
| -rw-r--r-- | vars/libX11.vars | 8 | ||||
| -rw-r--r-- | vars/libevent.vars | 8 | ||||
| -rw-r--r-- | vars/lighttpd.vars | 9 | ||||
| -rw-r--r-- | vars/mc.vars | 8 | ||||
| -rw-r--r-- | vars/procps_ng.vars | 8 | ||||
| -rw-r--r-- | vars/smallbasic.vars | 9 | ||||
| -rw-r--r-- | vars/util_linux.vars | 8 | ||||
| -rw-r--r-- | vars/vim.vars | 16 | ||||
| -rw-r--r-- | vars/xcb.vars | 8 |
19 files changed, 153 insertions, 94 deletions
diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 6b6b3125..e6445002 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -37,7 +37,12 @@ pkg_configure_autotools() { -exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \; \ -exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;; if [ "${PKG_BUILD_TYPE}" != host ]; then - ex_build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${PKG_BUILD_DIR}/"; + if [ -n "${PKG_CONFIG_CACHE}" ]; then + echo "${PKG_CONFIG_CACHE}" > "${PKG_BUILD_DIR}/config.cache"; + if [ -n "${PKG_CONFIG_CACHE_EXTRA}" ]; then + echo "${PKG_CONFIG_CACHE_EXTRA}" >> "${PKG_BUILD_DIR}/config.cache"; + fi; + fi; sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache"; fi; fi; diff --git a/vars/apr.vars b/vars/apr.vars index 5a27d455..7bd67578 100644 --- a/vars/apr.vars +++ b/vars/apr.vars @@ -2,6 +2,14 @@ # set -o errexit -o noglob are assumed. # +: ${PKG_APR_CONFIG_CACHE_EXTRA:=" +ac_cv_file__dev_zero=yes +ac_cv_func_setpgrp_void=yes +ac_cv_sizeof_struct_iovec=16 +ap_cv_void_ptr_lt_long=no +apr_cv_process_shared_works=no +apr_cv_tcp_nodelay_with_cork=no"}; + pkg_apr_install_make_post() { sed -e 's,echo "\$APR_BUILD_DIR/libtool",echo '"${PREFIX}"'/bin/slibtool,' \ -e 's,echo "\${installbuilddir}/libtool",echo '"${PREFIX}"'/bin/slibtool,' \ diff --git a/vars/bash.vars b/vars/bash.vars new file mode 100644 index 00000000..3d9bae15 --- /dev/null +++ b/vars/bash.vars @@ -0,0 +1,15 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_BASH_CONFIG_CACHE_EXTRA:=" +bash_cv_func_sigsetjmp=present +bash_cv_getcwd_malloc=yes +bash_cv_job_control_missing=present +bash_cv_printf_a_format=yes +bash_cv_sys_named_pipes=present +bash_cv_ulimit_maxfds=yes +bash_cv_under_sys_siglist=yes +bash_cv_unusable_rtsigs=no"}; + +# vim:filetype=sh diff --git a/vars/bison.vars b/vars/bison.vars new file mode 100644 index 00000000..3dca19a2 --- /dev/null +++ b/vars/bison.vars @@ -0,0 +1,9 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_BISON_CONFIG_CACHE_EXTRA:=" +ac_cv_path_M4=/bin/m4 +ac_cv_prog_gnu_m4_gnu=yes"}; + +# vim:filetype=sh diff --git a/vars/build.vars b/vars/build.vars index f3e381c9..bb52dbca 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1,3 +1,17 @@ +: ${DEFAULT_CONFIG_CACHE:=" +ac_cv_buggy_getaddrinfo=no +ac_cv_file__dev_ptc=no +ac_cv_file__dev_ptmx=yes +ac_cv_func_calloc_0_nonnull=yes +ac_cv_func_chown_works=yes +ac_cv_func_getgroups_works=yes +ac_cv_func_malloc_0_nonnull=yes +ac_cv_func_mmap_fixed_mapped=yes +ac_cv_func_strcoll_works=yes +ac_cv_func_strnlen_working=yes +ac_cv_func_working_mktime=yes +gt_cv_int_divbyzero_sigfpe=yes"}; + # # Build target invariants # @@ -27,7 +41,7 @@ HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX}"; : ${PKG_PKGCONF_HOST_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f}; : ${PKG_PKGCONF_HOST_VERSION:=0.9.12}; : ${PKG_PKGCONF_HOST_URL:=https://github.com/pkgconf/pkgconf/releases/download/pkgconf-${PKG_PKGCONF_HOST_VERSION}/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.bz2}; -: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX_NATIVE}"}; +: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="--prefix=${PREFIX_NATIVE}"}; : ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=}; : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa}; : ${PKG_BINUTILS_HOST_VERSION:=2.24.51}; @@ -194,7 +208,7 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; # HOST_PACKAGES_DEPS_BUILD_TYPE="host"; HOST_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST}"; -HOST_PACKAGES_DEPS_CONFIGURE_ARGS="-C --disable-nls --prefix=${PREFIX} --program-prefix="; +HOST_PACKAGES_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-prefix="; HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE=""; HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix="; HOST_PACKAGES_DEPS_PACKAGES=" diff --git a/vars/env.vars b/vars/env.vars index d9e06dd0..2599cb36 100644 --- a/vars/env.vars +++ b/vars/env.vars @@ -25,7 +25,7 @@ finish:finish"}; : ${PKG_BUILD_VARS:="BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA - CFLAGS_INSTALL_EXTRA CONFIGURE CONFIGURE_ARGS + CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXXFLAGS_CONFIGURE_EXTRA DISABLED ENV_VARS_EXTRA INSTALL_FILES INSTALL_TARGET INSTALL_TARGET_EXTRA LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA diff --git a/vars/gdk.vars b/vars/gdk.vars index 16d03deb..4f05c6c2 100644 --- a/vars/gdk.vars +++ b/vars/gdk.vars @@ -2,6 +2,9 @@ # set -o errexit -o noglob are assumed. # +: ${PKG_GDB_CONFIG_CACHE_EXTRA:=" +enable_gio_sniffing=yes"}; + pkg_gdk_install_pkgconfig_post() { local _pc_path; for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do diff --git a/vars/git.vars b/vars/git.vars index fc5fb89c..52037a65 100644 --- a/vars/git.vars +++ b/vars/git.vars @@ -2,6 +2,10 @@ # set -o errexit -o noglob are assumed. # +: ${PKG_GIT_CONFIG_CACHE_EXTRA:=" +ac_cv_fread_reads_directories=1 +ac_cv_snprintf_returns_bogus=0"}; + pkg_git_install_post() { local __ _new; for __ in $(find "${PKG_DESTDIR}" -name "Git*::*" -type f); do diff --git a/vars/glib.vars b/vars/glib.vars index fea598c4..4b53e569 100644 --- a/vars/glib.vars +++ b/vars/glib.vars @@ -2,6 +2,14 @@ # set -o errexit -o noglob are assumed. # +: ${PKG_GLIB_CONFIG_CACHE_EXTRA:=" +glib_cv_stack_grows=yes +glib_cv_uscore=yes +ac_cv_func_posix_getpwuid_r=yes +ac_cv_func_posix_getgrgid_r=yes +glib_cv_eventfd=no"}; +: ${PKG_GLIB_HOST_CONFIG_CACHE_EXTRA:=${PKG_GLIB_CONFIG_CACHE_EXTRA}}; + pkg_glib_install_pkgconfig_post() { local _pc_path; for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do diff --git a/etc/config.cache b/vars/gnulib.vars index e93a13e5..67ccaf6b 100644 --- a/etc/config.cache +++ b/vars/gnulib.vars @@ -1,54 +1,8 @@ -# apr -ac_cv_file__dev_zero=yes -ac_cv_func_setpgrp_void=yes -ac_cv_sizeof_struct_iovec=16 -ap_cv_void_ptr_lt_long=no -apr_cv_process_shared_works=no -apr_cv_tcp_nodelay_with_cork=no +# +# set -o errexit -o noglob are assumed. +# -# autoconf -ac_cv_buggy_getaddrinfo=no -ac_cv_file__dev_ptc=no -ac_cv_file__dev_ptmx=yes -ac_cv_func_calloc_0_nonnull=yes -ac_cv_func_chown_works=yes -ac_cv_func_getgroups_works=yes -ac_cv_func_malloc_0_nonnull=yes -ac_cv_func_mmap_fixed_mapped=yes -ac_cv_func_strcoll_works=yes -ac_cv_func_strnlen_working=yes -ac_cv_func_working_mktime=yes -gt_cv_int_divbyzero_sigfpe=yes - -# bash -bash_cv_func_sigsetjmp=present -bash_cv_getcwd_malloc=yes -bash_cv_job_control_missing=present -bash_cv_printf_a_format=yes -bash_cv_sys_named_pipes=present -bash_cv_ulimit_maxfds=yes -bash_cv_under_sys_siglist=yes -bash_cv_unusable_rtsigs=no - -# bison -ac_cv_path_M4=/bin/m4 -ac_cv_prog_gnu_m4_gnu=yes - -# git -ac_cv_fread_reads_directories=1 -ac_cv_snprintf_returns_bogus=0 - -# glib -glib_cv_stack_grows=yes -glib_cv_uscore=yes -ac_cv_func_posix_getpwuid_r=yes -ac_cv_func_posix_getgrgid_r=yes -glib_cv_eventfd=no - -# glib/gdk -enable_gio_sniffing=yes - -# gnulib +: ${PKG_GNULIB_CONFIG_CACHE_EXTRA:=" ac_cv_func___fseterr=yes gl_cv_func_cbrtl_ieee=yes gl_cv_func_ceilf_ieee=yes @@ -164,41 +118,6 @@ gl_cv_func_working_getdelim=yes gl_cv_func_working_mkstemp=yes gl_cv_func_working_mktime=yes gl_cv_func_working_strerror=yes -gl_cv_struct_dirent_d_ino=yes - -# libevent -ac_pe_target=true - -# libX11 -xorg_cv_malloc0_returns_null=yes - -# mc -ac_list_mounted_fs=found - -# pcre <- {lighttpd,smallbasic} -ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config -ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config - -# procps_ng -ac_cv_func_realloc_0_nonnull=yes - -# util_linux -ac_cv_prog_NCURSESW6_CONFIG=%PREFIX%/bin/ncursesw6-config - -# vim -ac_cv_small_wchar_t=no -ac_x_header_dirs=%PREFIX%/include -vim_cv_bcopy_handles_overlap=yes -vim_cv_getcwd_broken=no -vim_cv_memcpy_handles_overlap=no -vim_cv_memmove_handles_overlap=yes -vim_cv_stat_ignores_slash=no -vim_cv_terminfo=yes -vim_cv_toupper_broken=no -vim_cv_tty_group=tty -vim_cv_tty_mode=0666 - -# xcb -ac_cv_search_sendmsg=no +gl_cv_struct_dirent_d_ino=yes"}; # vim:filetype=sh diff --git a/vars/libX11.vars b/vars/libX11.vars new file mode 100644 index 00000000..a40ab8c9 --- /dev/null +++ b/vars/libX11.vars @@ -0,0 +1,8 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_LIBX11_CONFIG_CACHE_EXTRA:=" +xorg_cv_malloc0_returns_null=yes"}; + +# vim:filetype=sh diff --git a/vars/libevent.vars b/vars/libevent.vars new file mode 100644 index 00000000..6ce2cc60 --- /dev/null +++ b/vars/libevent.vars @@ -0,0 +1,8 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_LIBEVENT_CONFIG_CACHE_EXTRA:=" +ac_pe_target=true"}; + +# vim:filetype=sh diff --git a/vars/lighttpd.vars b/vars/lighttpd.vars new file mode 100644 index 00000000..346589c1 --- /dev/null +++ b/vars/lighttpd.vars @@ -0,0 +1,9 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_LIGHTTPD_CONFIG_CACHE_EXTRA:=" +ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config +ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config"}; + +# vim:filetype=sh diff --git a/vars/mc.vars b/vars/mc.vars new file mode 100644 index 00000000..a4ca6244 --- /dev/null +++ b/vars/mc.vars @@ -0,0 +1,8 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_MC_CONFIG_CACHE_EXTRA:=" +ac_list_mounted_fs=found"}; + +# vim:filetype=sh diff --git a/vars/procps_ng.vars b/vars/procps_ng.vars new file mode 100644 index 00000000..754461a0 --- /dev/null +++ b/vars/procps_ng.vars @@ -0,0 +1,8 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_PROCPS_NG_CONFIG_CACHE_EXTRA:=" +ac_cv_func_realloc_0_nonnull=yes"}; + +# vim:filetype=sh diff --git a/vars/smallbasic.vars b/vars/smallbasic.vars new file mode 100644 index 00000000..5dc9e4e0 --- /dev/null +++ b/vars/smallbasic.vars @@ -0,0 +1,9 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_SMALLBASIC_CONFIG_CACHE_EXTRA:=" +ac_cv_path_PCRECONFIG=%PREFIX%/bin/pcre-config +ac_cv_prog_have_pcre=%PREFIX%/bin/pcre-config"}; + +# vim:filetype=sh diff --git a/vars/util_linux.vars b/vars/util_linux.vars new file mode 100644 index 00000000..db3e2da4 --- /dev/null +++ b/vars/util_linux.vars @@ -0,0 +1,8 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_UTIL_LINUX_CONFIG_CACHE_EXTRA:=" +ac_cv_prog_NCURSESW6_CONFIG=%PREFIX%/bin/ncursesw6-config"}; + +# vim:filetype=sh diff --git a/vars/vim.vars b/vars/vim.vars index 1507d70d..b6d79777 100644 --- a/vars/vim.vars +++ b/vars/vim.vars @@ -2,9 +2,17 @@ # set -o errexit -o noglob are assumed. # -pkg_vim_configure_pre() { - ex_build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" \ - "${PKG_BASE_DIR}/${PKG_SUBDIR}/src/auto"; -}; +: ${PKG_VIM_CONFIG_CACHE_EXTRA:=" +ac_cv_small_wchar_t=no +ac_x_header_dirs=%PREFIX%/include +vim_cv_bcopy_handles_overlap=yes +vim_cv_getcwd_broken=no +vim_cv_memcpy_handles_overlap=no +vim_cv_memmove_handles_overlap=yes +vim_cv_stat_ignores_slash=no +vim_cv_terminfo=yes +vim_cv_toupper_broken=no +vim_cv_tty_group=tty +vim_cv_tty_mode=0666"}; # vim:filetype=sh diff --git a/vars/xcb.vars b/vars/xcb.vars new file mode 100644 index 00000000..c734a4dd --- /dev/null +++ b/vars/xcb.vars @@ -0,0 +1,8 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_XCB_CONFIG_CACHE_EXTRA:=" +ac_cv_search_sendmsg=no"}; + +# vim:filetype=sh |