sablink
/
build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[armv7l/portage] cannot use make.conf.common, because it will end up in image

This commit is contained in:
Fabio Erculiani 2012-02-13 18:47:58 +01:00
parent 658c75e1d0
commit 21409959d3
4 changed files with 56 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
conf/armv7l/portage/make.conf.common
View File

@ -1,23 +0,0 @@
# Portage configuration
ACCEPT_KEYWORDS="~arm arm"
FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
MAKEOPTS="-j16 -s"
CCACHE_SIZE="50G"
# Global USE flags
USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis"
# distcc configuration
DISTCC_SSH="/etc/distcc/distcc-ssh"
# <host>/<number of jobs>
# Works with QEMU warnings (damn)
# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp"
# Works
DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp"
# DISTCC_VERBOSE=1
# Package specific configuration
APACHE2_MPMS="prefork"
# Filter out crap from packages
INSTALL_MASK="usr/share/gtk-doc/html/*"
PKG_INSTALL_MASK="${INSTALL_MASK}"

29
conf/armv7l/portage/make.conf.hardfp
View File

@ -6,6 +6,33 @@ CXXFLAGS="${CFLAGS}"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
CHOST="armv7a-hardfloat-linux-gnueabi"
source /etc/make.conf.common
### COMMON PART
#################################################
# Portage configuration
ACCEPT_KEYWORDS="~arm arm"
FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
MAKEOPTS="-j16 -s"
CCACHE_SIZE="50G"
# Global USE flags
USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis"
# distcc configuration
DISTCC_SSH="/etc/distcc/distcc-ssh"
# <host>/<number of jobs>
# Works with QEMU warnings (damn)
# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp"
# Works
DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp"
# DISTCC_VERBOSE=1
# Package specific configuration
APACHE2_MPMS="prefork"
# Filter out crap from packages
INSTALL_MASK="usr/share/gtk-doc/html/*"
PKG_INSTALL_MASK="${INSTALL_MASK}"
#################################################
### END COMMON PART -- cut here
source /var/lib/layman/make.conf

29
conf/armv7l/portage/make.conf.softfp
View File

@ -6,5 +6,32 @@ CXXFLAGS="${CFLAGS}"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
CHOST="armv7a-unknown-linux-gnueabi"
source /etc/make.conf.common
### COMMON PART
#################################################
# Portage configuration
ACCEPT_KEYWORDS="~arm arm"
FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug"
MAKEOPTS="-j16 -s"
CCACHE_SIZE="50G"
# Global USE flags
USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis"
# distcc configuration
DISTCC_SSH="/etc/distcc/distcc-ssh"
# <host>/<number of jobs>
# Works with QEMU warnings (damn)
# DISTCC_HOSTS="localhost/1 distcc@localhost/15,lzo,cpp"
# Works
DISTCC_HOSTS="localhost/1 127.0.0.1/15,lzo,cpp"
# DISTCC_VERBOSE=1
# Package specific configuration
APACHE2_MPMS="prefork"
# Filter out crap from packages
INSTALL_MASK="usr/share/gtk-doc/html/*"
PKG_INSTALL_MASK="${INSTALL_MASK}"
#################################################
### END COMMON PART -- cut here
source /var/lib/layman/make.conf

6
git-hooks/post-merge
View File

@ -5,7 +5,6 @@ echo "post-merge hook is executing"
arch="$(uname -m)"
src_make_conf=""
src_make_conf_common=""
case $arch in
i686)
src_make_conf="./conf/intel/portage/make.conf.x86"
@ -16,10 +15,8 @@ case $arch in
arm*)
if [ -e "/usr/lib/gcc/armv7a-hardfloat-linux-gnueabi" ]; then
src_make_conf="./conf/armv7l/portage/make.conf.hardfp"
src_make_conf_common="./conf/armv7l/portage/make.conf.common"
elif [ -e "/usr/lib/gcc/armv7a-unknown-linux-gnueabi" ]; then
src_make_conf="./conf/armv7l/portage/make.conf.softfp"
src_make_conf_common="./conf/armv7l/portage/make.conf.common"
else
echo "UNSUPPORTED ARM ABI, CANNOT COPY make.conf !!!"
fi
@ -31,7 +28,4 @@ if [ -z "$src_make_conf" ]; then
else
echo "post-merge hook: copying make.conf (from $src_make_conf):"
cp --no-target-directory -v "$src_make_conf" /etc/make.conf
if [ -n "$src_make_conf_common" ]; then
cp --no-target-directory -v "$src_make_conf_common" "/etc/$(basename $src_make_conf_common)"
fi
fi