tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

okteta: fixed conflict

Browse Source
This commit is contained in:
norvegh
2015-05-22 14:21:16 +02:00
parent 2e50fd9627 0609f4c62b
commit 9babf62ca6
202 changed files with 13967 additions and 3181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/environment/configure/autoconf_cache/musl-linux Normal file
View File

@@ -0,0 +1,5 @@
# Force detection of musl's gettext
gt_func_gnugettext_libc=yes
gt_cv_func_gnugettext1_libc=yes
gt_cv_func_gnugettext2_libc=yes
gt_cv_func_gnugettext3_libc=yes

27
common/environment/configure/gnu-configure-args.sh
View File

@@ -4,7 +4,9 @@ if [ -n "$build_style" -a "$build_style" != "gnu-configure" ]; then
return 0
fi
export configure_args="--prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info --mandir=/usr/share/man --localstatedir=/var ${configure_args}"
export configure_args="--prefix=/usr --sysconfdir=/etc --bindir=/usr/bin
--mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var ${configure_args}"
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
@@ -14,22 +16,31 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
export configure_args+=" --libdir=/usr/lib32"
fi
# Cross compilation vars
if [ -z "$CROSS_BUILD" ]; then
return 0
fi
export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
_AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
# From now on all vars are exported to the environment
set -a
# Read autoconf cache variables for native target.
case "$XBPS_TARGET_MACHINE" in
# musl libc
*-musl) . ${_AUTOCONFCACHEDIR}/musl-linux
;;
esac
# Cross compilation vars
if [ -z "$CROSS_BUILD" ]; then
set +a
return 0
fi
export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
# Read autoconf cache variables for cross target (taken from OE).
case "$XBPS_TARGET_MACHINE" in
# musl libc
*-musl) . ${_AUTOCONFCACHEDIR}/common-linux
. ${_AUTOCONFCACHEDIR}/musl-linux
;;
# gnu libc
*) . ${_AUTOCONFCACHEDIR}/common-linux

2
common/hooks/pre-configure/02-script-wrapper.sh
View File

@@ -42,6 +42,7 @@ generic_wrapper3() {
cp ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ${XBPS_WRAPPERDIR}
sed -e "s,/usr/include,${XBPS_CROSS_BASE}/usr/include,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,/usr/lib,${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,^libdir=.*,libdir=${XBPS_CROSS_BASE}/usr/lib,g" -i ${XBPS_WRAPPERDIR}/${wrapper}
sed -e "s,^prefix=.*,prefix=${XBPS_CROSS_BASE}/usr," -i ${XBPS_WRAPPERDIR}/${wrapper}
@@ -120,6 +121,7 @@ hook() {
generic_wrapper3 ncurses5-config
generic_wrapper3 ncursesw5-config
generic_wrapper3 libetpan-config
generic_wrapper3 nspr-config
python_wrapper python-config 2.7
python_wrapper python3.4-config 3.4m
}

4
common/shlibs
View File

@@ -764,7 +764,7 @@ libclutter-gtk-1.0.so.0 clutter-gtk-1.1.2_1
libchamplain-0.12.so.0 libchamplain-0.12.5_2
libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2
libgeoclue.so.0 geoclue-0.12.0_1
libvpx.so.1 libvpx-1.0.0_1
libvpx.so.2 libvpx-1.4.0_1
libXevie.so.1 libXevie-1.0.2_1
libatspi.so.0 at-spi2-core-1.91.91_1
libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
@@ -1733,6 +1733,7 @@ libmarco-private.so.0 libmarco-1.8.0_1
libmate-menu.so.2 mate-menus-1.8.0_1
libcaja-extension.so.1 libcaja-1.8.1_1
libmatekbd.so.4 libmatekbd-1.8.0_1
libmatemixer.so.0 libmatemixer-1.10.0_1
libmatekbdui.so.4 libmatekbd-1.8.0_1
libmate-window-settings.so.1 libmate-control-center-1.8.1_1
libmateweather.so.1 libmateweather-1.8.0_1
@@ -2031,6 +2032,7 @@ libiec61883.so.0 libiec61883-1.2.0_1
libffado.so.2 libffado-2.2.1_1
libossp-uuid.so.16 libossp-1.6.2_1
libplayerctl-1.0.so.0 playerctl-0.4.2_1
libfdt.so.1 dtc-1.4.1_1
libokteta1core.so.1 okteta-4.14.2_1
libkasten2gui.so.2 okteta-4.14.2_1
libkasten2okteta1controllers.so.1 okteta-4.14.2_1