summaryrefslogtreecommitdiffhomepage
path: root/groups
diff options
context:
space:
mode:
Diffstat (limited to 'groups')
-rw-r--r--groups/010.host_deps.group1
-rw-r--r--groups/020.host_deps_rpm.group3
-rw-r--r--groups/201.native_packages.group1
-rw-r--r--groups/231.native_packages_etc.group6
-rw-r--r--groups/800.minipix.group1
5 files changed, 9 insertions, 3 deletions
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 43528908..07690401 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -3,6 +3,7 @@
#
HOST_DEPS_BUILD_TYPE="host";
HOST_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST:+${DEFAULT_CFLAGS_HOST} }-I${PREFIX}/include";
+HOST_DEPS_CXXFLAGS_CONFIGURE="${DEFAULT_CXXFLAGS_HOST:+${DEFAULT_CXXFLAGS_HOST} }-I${PREFIX}/include";
HOST_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-prefix=";
HOST_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
HOST_DEPS_MAKEFLAGS_INSTALL="prefix= PREFIX=";
diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group
index 694147b8..f8797a21 100644
--- a/groups/020.host_deps_rpm.group
+++ b/groups/020.host_deps_rpm.group
@@ -2,7 +2,10 @@
# Build group host_deps_rpm
#
HOST_DEPS_RPM_BUILD_TYPE="host";
+HOST_DEPS_RPM_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_HOST:+${DEFAULT_CFLAGS_HOST} }-I${PREFIX}/include";
+HOST_DEPS_RPM_CXXFLAGS_CONFIGURE="${DEFAULT_CXXFLAGS_HOST:+${DEFAULT_CXXFLAGS_HOST} }-I${PREFIX}/include";
HOST_DEPS_RPM_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}";
+HOST_DEPS_RPM_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
HOST_DEPS_RPM_MAKEFLAGS_INSTALL_EXTRA="prefix= PREFIX=";
HOST_DEPS_RPM_PACKAGES="
libarchive_host lmdb_host popt_host rpm_host";
diff --git a/groups/201.native_packages.group b/groups/201.native_packages.group
index 1983aef3..62dbd9e7 100644
--- a/groups/201.native_packages.group
+++ b/groups/201.native_packages.group
@@ -2,6 +2,7 @@
# Build group native_packages
#
NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_CXXFLAGS_CONFIGURE="${DEFAULT_CXXFLAGS:+${DEFAULT_CXXFLAGS} }--sysroot=${PREFIX_NATIVE}";
NATIVE_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index c9d75e23..40f49ef9 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -34,12 +34,12 @@ zstd";
: ${PKG_BMAKE_CONFIGURE_ARGS="-C --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET}"};
: ${PKG_BMAKE_ENV_VARS_EXTRA:="BMAKE=${PREFIX}/bin/bmake"};
: ${PKG_BMAKE_MAKEFLAGS_BUILD:=-j1};
-: ${PKG_BOCHS_DEPENDS:="curl"};
+: ${PKG_BOCHS_DEPENDS:="curl ncurses"};
: ${PKG_BOCHS_SHA256SUM:=ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c};
: ${PKG_BOCHS_VERSION:=2.6.9};
: ${PKG_BOCHS_URL:=https://sourceforge.mirrorservice.org/b/bo/bochs/bochs/${PKG_BOCHS_VERSION}/bochs-${PKG_BOCHS_VERSION}.tar.gz};
: ${PKG_BOCHS_CONFIGURE_ARGS_EXTRA:="--without-x11 --with-term"};
-: ${PKG_BOCHS_CXXFLAGS_CONFIGURE_EXTRA:="-D_LARGEFILE64_SOURCE -I${PREFIX_NATIVE}/include"};
+: ${PKG_BOCHS_CXXFLAGS_CONFIGURE_EXTRA:="-D_LARGEFILE64_SOURCE -I${PREFIX_NATIVE}/include/ncurses"};
: ${PKG_BOCHS_INSTALL_FILES:="../obj/.libs/bochs=bin/ ../obj/.libs/bximage=bin/"};
: ${PKG_BOCHS_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib"};
: ${PKG_BOCHS_MAKEFLAGS_BUILD:="LIBS=-Wl,-ltinfo"};
@@ -109,7 +109,7 @@ fi;
: ${PKG_EXPAT_SHA256SUM:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2};
: ${PKG_EXPAT_VERSION:=2.2.6};
: ${PKG_EXPAT_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_VERSION}.tar.bz2};
-: ${PKG_FFMPEG_DEPENDS:="libshine libtheora libxml2"};
+: ${PKG_FFMPEG_DEPENDS:="libressl libshine libtheora libxml2"};
: ${PKG_FFMPEG_SHA256SUM:=b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5};
: ${PKG_FFMPEG_VERSION:=4.1};
: ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.bz2};
diff --git a/groups/800.minipix.group b/groups/800.minipix.group
index 2e6ee2ab..55151662 100644
--- a/groups/800.minipix.group
+++ b/groups/800.minipix.group
@@ -2,6 +2,7 @@
# Build group minipix
#
MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+MINIPIX_CXXFLAGS_CONFIGURE="${DEFAULT_CXXFLAGS:+${DEFAULT_CXXFLAGS} }--sysroot=${PREFIX_NATIVE}";
MINIPIX_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
MINIPIX_LDFLAGS_BUILD="--sysroot=${PREFIX_NATIVE} -mvrfs";