| [proaudio] [1052] fix fpu when compiling -sse om amd64 correctly |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1052
Author: gimpel
Date: 2007-12-16 19:43:11 +0000 (Sun, 16 Dec 2007)
Log Message:
-----------
fix fpu when compiling -sse om amd64 correctly
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/ardour/Manifest
trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.5.ebuild
trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.ebuild
Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest 2007-12-16 16:14:26 UTC (rev 1051)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest 2007-12-16 19:43:11 UTC (rev 1052)
@@ -12,22 +12,26 @@
SHA256 20326ecf95d15df46ca79d5645975138ec528e5490e5d3e4ecf92ff79dae783f files/ardour-syslib_mod2.patch 5359
DIST ardour-2.0.5.tar.bz2 2777524 RMD160 eb278fbd7121707b9b7d4dfbb1e2088ef36cb1d4 SHA1 9a3adea22c5f182832b90506cb354097c21caa4f SHA256 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
DIST ardour-2.1.tar.bz2 2788128 RMD160 70796eb07911c5301049fb2d2749cbaa7a04ba4d SHA1 fcfb1230b9e7ec42c0044be89a6e25aa31a75658 SHA256 160482d87d8eb2188481fc42d7f6442efe6bff38544a321a79e2e23a7aa9501b
-EBUILD ardour-2.0.5.ebuild 3721 RMD160 6a0c8d055e4bfbe02cba4ed422faffde66f92988 SHA1 3df66674fe4b83403ce22cbab8a0318650c189bb SHA256 79f22dcaea6d63cb96e4d4ccdcb12856f7944a4653d7613e62006074adaa7bd2
-MD5 22390fbaf7123089c1bfdf3936b8bfc1 ardour-2.0.5.ebuild 3721
-RMD160 6a0c8d055e4bfbe02cba4ed422faffde66f92988 ardour-2.0.5.ebuild 3721
-SHA256 79f22dcaea6d63cb96e4d4ccdcb12856f7944a4653d7613e62006074adaa7bd2 ardour-2.0.5.ebuild 3721
+EBUILD ardour-2.0.5.ebuild 3902 RMD160 e4c4727a8d6ce2856dfe58e10107084e2b24bb9a SHA1 02bad9218bfbd700ba535bfc88d545c92ebdb638 SHA256 0ef57a58ee5c4fdc5e762728492d5c4cf018b017b4f59c310cb0acf4363b7b81
+MD5 3d14b571123c1b4abba565bfe364484d ardour-2.0.5.ebuild 3902
+RMD160 e4c4727a8d6ce2856dfe58e10107084e2b24bb9a ardour-2.0.5.ebuild 3902
+SHA256 0ef57a58ee5c4fdc5e762728492d5c4cf018b017b4f59c310cb0acf4363b7b81 ardour-2.0.5.ebuild 3902
EBUILD ardour-2.0.99992.ebuild 5369 RMD160 ca3a8a9def57bbce50834d59e8745e33843f3cd1 SHA1 3462383d0eacd666b33ffd35622174a4d38b91e1 SHA256 a0746c9aa4298e86e21dfdee749db7fe5fe69fa7a6f7d0e2b34b98004d16507e
MD5 95f16698b20f907a94e276b5a1cbe34b ardour-2.0.99992.ebuild 5369
RMD160 ca3a8a9def57bbce50834d59e8745e33843f3cd1 ardour-2.0.99992.ebuild 5369
SHA256 a0746c9aa4298e86e21dfdee749db7fe5fe69fa7a6f7d0e2b34b98004d16507e ardour-2.0.99992.ebuild 5369
-EBUILD ardour-2.1.ebuild 4028 RMD160 4d97327361fb2eac2b2de12f0d501993185f0743 SHA1 c0c94c044fcbcc8b3a5f69393848787469be4c44 SHA256 bff897fac36b096964ef592896982d4bf3e6a7c551143179ad599e0ffb8bf906
-MD5 0cb032a232a80ebca03384533944b056 ardour-2.1.ebuild 4028
-RMD160 4d97327361fb2eac2b2de12f0d501993185f0743 ardour-2.1.ebuild 4028
-SHA256 bff897fac36b096964ef592896982d4bf3e6a7c551143179ad599e0ffb8bf906 ardour-2.1.ebuild 4028
+EBUILD ardour-2.1.ebuild 4210 RMD160 7d7faadbfc900e4107ded4ae79d547b5899ae625 SHA1 80f08f7d2374440ed5eb35d2a49330d0b0bbda80 SHA256 c7db53662f2508454e7e69281a3a2cfa6daaba6b759ed85b9208b44c383b9e44
+MD5 83db2614329355aa6de66b0ca862c46c ardour-2.1.ebuild 4210
+RMD160 7d7faadbfc900e4107ded4ae79d547b5899ae625 ardour-2.1.ebuild 4210
+SHA256 c7db53662f2508454e7e69281a3a2cfa6daaba6b759ed85b9208b44c383b9e44 ardour-2.1.ebuild 4210
EBUILD ardour-99992.ebuild 5132 RMD160 5ceaae253beb14b59275d3ae77487d8db1385e79 SHA1 4b2d203a539b483e581ef608feecf9008b62174b SHA256 539d671118f2fd4f86e7ec0a06ada4449cbee10546ef6ac7fb7f1b0be9278abf
MD5 06cc1b63deb62c249595ff5fd3c1acde ardour-99992.ebuild 5132
RMD160 5ceaae253beb14b59275d3ae77487d8db1385e79 ardour-99992.ebuild 5132
SHA256 539d671118f2fd4f86e7ec0a06ada4449cbee10546ef6ac7fb7f1b0be9278abf ardour-99992.ebuild 5132
+MISC .ardour-2.1.ebuild.swp 16384 RMD160 60a2650c5a26d50504584e5fec192385d5ecd873 SHA1 7352798dc0704cc100d3fc479200d755b46040ae SHA256 854a2e42bc92924f22a2c378ba168f66cce8b6c650dbfc6c256ccc41ff597946
+MD5 eb41418f79df3ec246232c6288290f50 .ardour-2.1.ebuild.swp 16384
+RMD160 60a2650c5a26d50504584e5fec192385d5ecd873 .ardour-2.1.ebuild.swp 16384
+SHA256 854a2e42bc92924f22a2c378ba168f66cce8b6c650dbfc6c256ccc41ff597946 .ardour-2.1.ebuild.swp 16384
MISC ChangeLog 603 RMD160 3b1ec2f28f4528471ed272f799fea37faf63249e SHA1 3942cb2c46b33440014ab818d304028a8f5f9250 SHA256 f18a0067a30db613511b2a105f1be46ba13ac626617a47a3f2d916fe9996a94e
MD5 9d6c44020894589da75a58750330a3c6 ChangeLog 603
RMD160 3b1ec2f28f4528471ed272f799fea37faf63249e ChangeLog 603
Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.5.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.5.ebuild 2007-12-16 16:14:26 UTC (rev 1051)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.5.ebuild 2007-12-16 19:43:11 UTC (rev 1052)
@@ -82,7 +82,7 @@
# Required for scons to "see" intermediate install location
mkdir -p "${D}"
- local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
+ local FPU_OPTIMIZATION="$((use altivec || use sse) && echo 1 || echo 0)"
cd "${S}"
tc-export CC CXX
@@ -90,18 +90,26 @@
# Avoid compiling x86 asm when building on amd64 without using sse
# bug #186798
- use amd64 && append-flags "-DUSE_X86_64_ASM"
+ # NOTE: this doesn't work
+ #use amd64 && append-flags "-DUSE_X86_64_ASM"
+
+ # touching FPU_OPTIMIZATION only if sse altivec is enabled, otherwhise
+ # don't even specify it
+ local myconf=""
+ (use sse || use altivec) && myconf="FPU_OPTIMIZATION=1"
+
scons \
$(ardour_use_enable DEBUG debug) \
- FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \
- DESTDIR="${D}" \
$(ardour_use_enable NLS nls) \
$(ardour_use_enable FFT_ANALYSIS fftw) \
$(ardour_use_enable VST vst) \
SYSLIBS=1 \
+ DESTDIR="${D}" \
CFLAGS="${CFLAGS}" \
- PREFIX=/usr || die "scons make failed"
+ PREFIX=/usr \
+ ${myconf} \
+ || die "scons make failed"
}
src_install() {
Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.ebuild 2007-12-16 16:14:26 UTC (rev 1051)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.ebuild 2007-12-16 19:43:11 UTC (rev 1052)
@@ -90,7 +90,7 @@
# Required for scons to "see" intermediate install location
mkdir -p "${D}"
- local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
+ #local FPU_OPTIMIZATION="$((use altivec || use sse) && echo 1 || echo 0)"
cd "${S}"
tc-export CC CXX
@@ -98,18 +98,26 @@
# Avoid compiling x86 asm when building on amd64 without using sse
# bug #186798
- use amd64 && append-flags "-DUSE_X86_64_ASM"
+ # NOTE: this doesn't work
+ #use amd64 && append-flags "-DUSE_X86_64_ASM"
+ # touching FPU_OPTIMIZATION only if sse altivec is enabled, otherwhise
+ # don't even specify it
+
+ local myconf=""
+ (use sse || use altivec) && myconf="FPU_OPTIMIZATION=1"
+
scons \
$(ardour_use_enable DEBUG debug) \
- FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \
- DESTDIR="${D}" \
$(ardour_use_enable NLS nls) \
$(ardour_use_enable FFT_ANALYSIS fftw) \
$(ardour_use_enable VST vst) \
$(ardour_use_enable SYSLIBS sys-libs) \
+ DESTDIR="${D}" \
CFLAGS="${CFLAGS}" \
- PREFIX=/usr || die "scons make failed"
+ PREFIX=/usr \
+ ${myconf} \
+ || die "scons make failed"
}
src_install() {