mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-13 02:23:51 +02:00
icewm: fix cross
This commit is contained in:
parent
85a4d8556e
commit
03d7c58d83
2 changed files with 69 additions and 3 deletions
51
srcpkgs/icewm/patches/fix-configure_in_flags.patch
Normal file
51
srcpkgs/icewm/patches/fix-configure_in_flags.patch
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
Add HOSTCXXFLAGS and HOSTLDFLAGS to the substituted vars.
|
||||||
|
|
||||||
|
--- configure.in 2013-11-17 17:54:39.000000000 +0100
|
||||||
|
+++ configure.in 2016-12-08 19:18:41.299412824 +0100
|
||||||
|
@@ -89,6 +89,19 @@
|
||||||
|
|
||||||
|
AC_SUBST(HOSTCXX_LINK)
|
||||||
|
|
||||||
|
+if test x"$HOSTCXXFLAGS" = x; then
|
||||||
|
+ HOSTCXXFLAGS="$CXXFLAGS"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+AC_SUBST(HOSTCXXFLAGS)
|
||||||
|
+
|
||||||
|
+if test x"$HOSTLDFLAGS" = x; then
|
||||||
|
+ HOSTCXXFLAGS="$LDFLAGS"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+AC_SUBST(HOSTLDFLAGS)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
#this test is broken, because AC_TRY_LINK calls g++
|
||||||
|
#AC_MSG_CHECKING([if we need our own C++ allocation operators])
|
||||||
|
#AC_TRY_LINK([ void icewm_alloc() {
|
||||||
|
--- src/Makefile.in 2016-12-08 19:21:46.490133362 +0100
|
||||||
|
+++ src/Makefile.in 2016-12-08 19:20:49.259218801 +0100
|
||||||
|
@@ -11,8 +11,10 @@
|
||||||
|
|
||||||
|
CXX = @CXX@
|
||||||
|
HOSTCXX = @HOSTCXX@
|
||||||
|
+HOSTCXXFLAGS = @HOSTCXXFLAGS@
|
||||||
|
LD = @CXX_LINK@
|
||||||
|
HOSTLD = @HOSTCXX_LINK@
|
||||||
|
+HOSTLDFLAGS = @HOSTLDFLAGS@
|
||||||
|
EXEEXT = @EXEEXT@
|
||||||
|
|
||||||
|
DEBUG = @DEBUG@
|
||||||
|
@@ -211,11 +213,11 @@
|
||||||
|
|
||||||
|
genpref.o: genpref.cc
|
||||||
|
@echo " HOSTCXX " $@
|
||||||
|
- @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $<
|
||||||
|
+ @$(HOSTCXX) $(HOSTCXXFLAGS) -DVERSION='"@VERSION@"' $(GCCDEP) -c $<
|
||||||
|
|
||||||
|
genpref$(EXEEXT):
|
||||||
|
@echo " HOSTLD " $@
|
||||||
|
- @$(HOSTLD) -o $@ $(genpref_OBJS)
|
||||||
|
+ @$(HOSTLD) $(HOSTLDFLAGS) -o $@ $(genpref_OBJS)
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
# Template file for 'icewm'
|
# Template file for 'icewm'
|
||||||
pkgname=icewm
|
pkgname=icewm
|
||||||
version=1.3.8
|
version=1.3.8
|
||||||
revision=3
|
revision=4
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-shaped-decorations --enable-gradients"
|
configure_args="--enable-shaped-decorations --enable-gradients"
|
||||||
|
make_build_args="V=1"
|
||||||
make_install_target="install install-docs"
|
make_install_target="install install-docs"
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="automake libtool pkg-config"
|
||||||
makedepends="libXrandr-devel libXft-devel libSM-devel libXinerama-devel gdk-pixbuf-devel"
|
makedepends="libXrandr-devel libXft-devel libSM-devel libXinerama-devel gdk-pixbuf-devel"
|
||||||
short_desc="A Window Manager designed for speed, usability, and consistency"
|
short_desc="A Window Manager designed for speed, usability, and consistency"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
|
@ -14,5 +15,19 @@ homepage="http://www.icewm.org/"
|
||||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
|
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||||
checksum=17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18
|
checksum=17588d9e0bbbb23587bc04c83da9dd94fd4da6894ecfee6d7f3ed50d780dcd18
|
||||||
|
|
||||||
nocross="https://travis-ci.org/voidlinux/void-packages/jobs/182169066"
|
|
||||||
CXXFLAGS="-Wno-error=narrowing"
|
CXXFLAGS="-Wno-error=narrowing"
|
||||||
|
if [ -n "$CROSS_BUILD" ]; then
|
||||||
|
# The iconv detection does not work when cross compiling
|
||||||
|
configure_args+=" --disable-i18n"
|
||||||
|
# Required to compile genpref for the host
|
||||||
|
hostmakedepends+=" libX11-devel"
|
||||||
|
# Set host tools for compiling genprefs
|
||||||
|
export HOSTCXX="${CXX_FOR_BUILD}"
|
||||||
|
export HOSTCXX_LINK="${CXX_FOR_BUILD}"
|
||||||
|
export HOSTCXXFLAGS="${CXXFLAGS_FOR_BUILD}"
|
||||||
|
export HOSTLDFLAGS="${LDFLAGS_FOR_BUILD}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
pre_configure() {
|
||||||
|
./autogen.sh
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue