| 1 |
jlec 14/01/28 12:47:40 |
| 2 |
|
| 3 |
Added: xkaapi-2.1-ffi.patch xkaapi-2.1-flags.patch |
| 4 |
Log: |
| 5 |
New addition, written by me |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: xkaapi-2.1-ffi.patch |
| 16 |
=================================================================== |
| 17 |
configure.ac | 8 ++++---- |
| 18 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/configure.ac b/configure.ac |
| 21 |
index 2be95ec..13e876b 100644 |
| 22 |
--- a/configure.ac |
| 23 |
+++ b/configure.ac |
| 24 |
@@ -1034,12 +1034,12 @@ dnl ----------------------------------------------------------------------- |
| 25 |
|
| 26 |
dnl we need to always configure imported-soft/libffi in order to be able |
| 27 |
dnl to run "make dist" |
| 28 |
-#if test x"$use_ffi" = xinternal; then |
| 29 |
+if test x"$use_ffi" = xinternal; then |
| 30 |
mkdir -p "imported-soft/libffi" |
| 31 |
AC_CONFIG_SUBDIRS([imported-soft/libffi]) |
| 32 |
-#else |
| 33 |
-# AC_MSG_NOTICE([Not compiling embedded copy of libffi]) |
| 34 |
-#fi |
| 35 |
+else |
| 36 |
+ AC_MSG_NOTICE([Not compiling embedded copy of libffi]) |
| 37 |
+fi |
| 38 |
|
| 39 |
dnl ----------------------------------------------------------------------- |
| 40 |
dnl Dependencies between libs |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 sci-libs/xkaapi/files/xkaapi-2.1-flags.patch |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/xkaapi/files/xkaapi-2.1-flags.patch?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/xkaapi/files/xkaapi-2.1-flags.patch?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: xkaapi-2.1-flags.patch |
| 50 |
=================================================================== |
| 51 |
configure.ac | 11 ++++++++++- |
| 52 |
1 file changed, 10 insertions(+), 1 deletion(-) |
| 53 |
|
| 54 |
diff --git a/configure.ac b/configure.ac |
| 55 |
index c3364aa..2a734fe 100644 |
| 56 |
--- a/configure.ac |
| 57 |
+++ b/configure.ac |
| 58 |
@@ -82,6 +82,9 @@ AC_PROG_F77 |
| 59 |
dnl ---------------------------------------------------------------- |
| 60 |
dnl Disable default flag for compilation |
| 61 |
dnl ---------------------------------------------------------------- |
| 62 |
+CPPFLAGS_gentoo="${CPPFLAGS}" |
| 63 |
+CFLAGS_gentoo="${CFLAGS}" |
| 64 |
+CXXFLAGS_gentoo="${CXXFLAGS}" |
| 65 |
CPPFLAGS="" |
| 66 |
CFLAGS="" |
| 67 |
CXXFLAGS="" |
| 68 |
@@ -407,7 +410,7 @@ AC_ARG_ENABLE([mode],[AS_HELP_STRING([--enable-mode], |
| 69 |
[choose special compilation mode (debug, release)])],[], |
| 70 |
[enable_mode=default] |
| 71 |
) |
| 72 |
-clean_default_flags |
| 73 |
+clean_default_flags=no |
| 74 |
AS_CASE([$enable_mode], |
| 75 |
[default], [dnl |
| 76 |
AM_CPPFLAGS="$AM_CPPFLAGS" |
| 77 |
@@ -428,6 +431,12 @@ AS_CASE([$enable_mode], |
| 78 |
AM_CFLAGS="$AM_CFLAGS -O3 -DNDEBUG" |
| 79 |
AM_CXXFLAGS="$AM_CXXFLAGS -O3 -DNDEBUG" |
| 80 |
clean_default_flags=yes |
| 81 |
+ ], [gentoo], [dnl |
| 82 |
+ AC_MSG_NOTICE([Using gentoo compile mode]) |
| 83 |
+ AM_CPPFLAGS="$AM_CPPFLAGS ${CPPFLAGS_gentoo}" |
| 84 |
+ AM_CFLAGS="$AM_CFLAGS -DNDEBUG ${CFLAGS_gentoo}" |
| 85 |
+ AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG ${CXXFLAGS_gentoo}" |
| 86 |
+ clean_default_flags=yes |
| 87 |
], [dnl |
| 88 |
AC_MSG_ERROR([Unknown compilation mode '$enable_mode'. Aborting.]) |
| 89 |
]) |
Archives