summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-libs/xkaapi/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-libs/xkaapi/files')
-rw-r--r--sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch24
-rw-r--r--sci-libs/xkaapi/files/xkaapi-2.1-flags.patch39
-rw-r--r--sci-libs/xkaapi/files/xkaapi-3.0.3-flags.patch31
3 files changed, 94 insertions, 0 deletions
diff --git a/sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch b/sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch
new file mode 100644
index 000000000000..485b6c21a969
--- /dev/null
+++ b/sci-libs/xkaapi/files/xkaapi-2.1-ffi.patch
@@ -0,0 +1,24 @@
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2be95ec..13e876b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1034,12 +1034,12 @@ dnl -----------------------------------------------------------------------
+
+ dnl we need to always configure imported-soft/libffi in order to be able
+ dnl to run "make dist"
+-#if test x"$use_ffi" = xinternal; then
++if test x"$use_ffi" = xinternal; then
+ mkdir -p "imported-soft/libffi"
+ AC_CONFIG_SUBDIRS([imported-soft/libffi])
+-#else
+-# AC_MSG_NOTICE([Not compiling embedded copy of libffi])
+-#fi
++else
++ AC_MSG_NOTICE([Not compiling embedded copy of libffi])
++fi
+
+ dnl -----------------------------------------------------------------------
+ dnl Dependencies between libs
diff --git a/sci-libs/xkaapi/files/xkaapi-2.1-flags.patch b/sci-libs/xkaapi/files/xkaapi-2.1-flags.patch
new file mode 100644
index 000000000000..a22cabf9e4dd
--- /dev/null
+++ b/sci-libs/xkaapi/files/xkaapi-2.1-flags.patch
@@ -0,0 +1,39 @@
+ configure.ac | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c3364aa..2a734fe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,9 @@ AC_PROG_F77
+ dnl ----------------------------------------------------------------
+ dnl Disable default flag for compilation
+ dnl ----------------------------------------------------------------
++CPPFLAGS_gentoo="${CPPFLAGS}"
++CFLAGS_gentoo="${CFLAGS}"
++CXXFLAGS_gentoo="${CXXFLAGS}"
+ CPPFLAGS=""
+ CFLAGS=""
+ CXXFLAGS=""
+@@ -407,7 +410,7 @@ AC_ARG_ENABLE([mode],[AS_HELP_STRING([--enable-mode],
+ [choose special compilation mode (debug, release)])],[],
+ [enable_mode=default]
+ )
+-clean_default_flags
++clean_default_flags=no
+ AS_CASE([$enable_mode],
+ [default], [dnl
+ AM_CPPFLAGS="$AM_CPPFLAGS"
+@@ -428,6 +431,12 @@ AS_CASE([$enable_mode],
+ AM_CFLAGS="$AM_CFLAGS -O3 -DNDEBUG"
+ AM_CXXFLAGS="$AM_CXXFLAGS -O3 -DNDEBUG"
+ clean_default_flags=yes
++ ], [gentoo], [dnl
++ AC_MSG_NOTICE([Using gentoo compile mode])
++ AM_CPPFLAGS="$AM_CPPFLAGS ${CPPFLAGS_gentoo}"
++ AM_CFLAGS="$AM_CFLAGS -DNDEBUG ${CFLAGS_gentoo}"
++ AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG ${CXXFLAGS_gentoo}"
++ clean_default_flags=yes
+ ], [dnl
+ AC_MSG_ERROR([Unknown compilation mode '$enable_mode'. Aborting.])
+ ])
diff --git a/sci-libs/xkaapi/files/xkaapi-3.0.3-flags.patch b/sci-libs/xkaapi/files/xkaapi-3.0.3-flags.patch
new file mode 100644
index 000000000000..0fdad94cb9b9
--- /dev/null
+++ b/sci-libs/xkaapi/files/xkaapi-3.0.3-flags.patch
@@ -0,0 +1,31 @@
+ configure.ac | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c3364aa..2a734fe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,6 +82,9 @@ AC_PROG_F77
+ dnl ----------------------------------------------------------------
+ dnl Disable default flag for compilation
+ dnl ----------------------------------------------------------------
++CPPFLAGS_gentoo="${CPPFLAGS}"
++CFLAGS_gentoo="${CFLAGS}"
++CXXFLAGS_gentoo="${CXXFLAGS}"
+ CPPFLAGS=""
+ CFLAGS=""
+ CXXFLAGS=""
+@@ -428,6 +431,13 @@ AS_CASE([$enable_mode],
+ AM_CXXFLAGS="$AM_CXXFLAGS -O3 -DNDEBUG"
+ clean_default_flags=yes
+ AM_CONDITIONAL([KAAPI_USE_DEBUG], [test "$enable_mode" = truc ])
++ ], [gentoo], [dnl
++ AC_MSG_NOTICE([Using gentoo compile mode])
++ AM_CPPFLAGS="$AM_CPPFLAGS ${CPPFLAGS_gentoo}"
++ AM_CFLAGS="$AM_CFLAGS -DNDEBUG ${CFLAGS_gentoo}"
++ AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG ${CXXFLAGS_gentoo}"
++ clean_default_flags=yes
++ AM_CONDITIONAL([KAAPI_USE_DEBUG], [test "$enable_mode" = gentoo ])
+ ], [dnl
+ AC_MSG_ERROR([Unknown compilation mode '$enable_mode'. Aborting.])
+ ])