[nar-maven-plugin] Added support for secondary architectures
Dan Horák
sharkcz at fedoraproject.org
Fri Jul 11 10:46:22 UTC 2014
commit eb9fe714a4d86fe60be7657ac4fb278a307e7b44
Author: Jakub Čajka <jcajka at redhat.com>
Date: Fri Jul 11 11:43:29 2014 +0200
Added support for secondary architectures
nar-maven-plugin.spec | 9 ++-
secarch.patch | 212 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 220 insertions(+), 1 deletions(-)
---
diff --git a/nar-maven-plugin.spec b/nar-maven-plugin.spec
index b77662a..c9dce92 100644
--- a/nar-maven-plugin.spec
+++ b/nar-maven-plugin.spec
@@ -1,6 +1,6 @@
Name: nar-maven-plugin
Version: 3.0.0
-Release: 7%{dist}
+Release: 8%{dist}
Summary: Native ARchive plugin for Maven
License: ASL 2.0 and LGPLv2
URL: https://github.com/maven-nar/nar-maven-plugin/
@@ -10,6 +10,9 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: 0001-Add-support-for-handling-the-RPM_OPT_FLAGS-variable-.patch
Patch1: 0002-Added-ARM-support.patch
Patch2: 0003-Added-PPC64LE-support.patch
+# Patch adds support for rest sec archs not included in previous patches,
+# also fixes bad C defines on ppc64le
+Patch3: secarch.patch
BuildRequires: maven-plugins-pom
BuildRequires: maven-local
@@ -44,6 +47,7 @@ This package contains the API documentation for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1 -b .secarch
# Remove bundled stuff
rm -rf src/it/it0006-jni-3rdparty/src/nar/resources/aol
@@ -71,6 +75,9 @@ rm src/main/java/com/github/maven_nar/NarIntegrationTestMojo.java
%doc README.md LICENSE-2.0.txt
%changelog
+* Fri Jul 11 2014 Jakub Čajka <jcajka at redhat.com> - 3.0.0-8
+- Added/fixed support for secondary architectures(s390(x),ppc(64(le)), aarch64)
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/secarch.patch b/secarch.patch
new file mode 100644
index 0000000..d2c13da
--- /dev/null
+++ b/secarch.patch
@@ -0,0 +1,212 @@
+diff -up nar-maven-plugin-nar-maven-plugin-3.0.0/src/main/resources/com/github/maven_nar/aol.properties.secarch nar-maven-plugin-nar-maven-plugin-3.0.0/src/main/resources/com/github/maven_nar/aol.properties
+--- nar-maven-plugin-nar-maven-plugin-3.0.0/src/main/resources/com/github/maven_nar/aol.properties.secarch 2014-07-11 11:25:05.062555613 +0200
++++ nar-maven-plugin-nar-maven-plugin-3.0.0/src/main/resources/com/github/maven_nar/aol.properties 2014-07-11 11:27:21.652910930 +0200
+@@ -611,7 +611,7 @@ ppc64le.Linux.gpp.cpp.includes=**/*.cc *
+ ppc64le.Linux.gpp.cpp.excludes=
+
+ ppc64le.Linux.gpp.c.compiler=gcc
+-ppc64le.Linux.gpp.c.defines=ARM LINUX
++ppc64le.Linux.gpp.c.defines=Linux GNU_GCC
+ ppc64le.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
+ ppc64le.Linux.gpp.c.includes=**/*.c
+ ppc64le.Linux.gpp.c.excludes=
+@@ -953,3 +953,199 @@ ppc.AIX.gcc.jni.extension=a
+ #ppc.AIX.gpp.arch.includes=lib/**/*.a lib/**/*.so
+
+
++#
++# PPC64
++#
++ppc64.Linux.linker=g++
++
++ppc64.Linux.gpp.cpp.compiler=g++
++ppc64.Linux.gpp.cpp.defines=Linux GNU_GCC
++ppc64.Linux.gpp.cpp.options=-c -fPIC -pthread -fexceptions -O2 -fno-strict-aliasing -fno-omit-frame-pointer -Wall -Wextra
++ppc64.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
++ppc64.Linux.gpp.cpp.excludes=
++
++ppc64.Linux.gpp.c.compiler=gcc
++ppc64.Linux.gpp.c.defines=Linux GNU_GCC
++ppc64.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
++ppc64.Linux.gpp.c.includes=**/*.c
++ppc64.Linux.gpp.c.excludes=
++
++# options for gcc linker front end
++ppc64.Linux.gpp.linker.options=-shared -shared-libgcc -fPIC -fexceptions
++ppc64.Linux.gpp.linker.sysLibs=stdc++
++ppc64.Linux.gpp.linker.libs=
++
++ppc64.Linux.gpp.java.include=include;include/linux
++ppc64.Linux.gpp.java.runtimeDirectory=jre/lib/ppc64/client
++
++ppc64.Linux.gpp.lib.prefix=lib
++ppc64.Linux.gpp.shared.prefix=lib
++ppc64.Linux.gpp.static.extension=a
++ppc64.Linux.gpp.shared.extension=so
++ppc64.Linux.gpp.plugin.extension=so
++ppc64.Linux.gpp.jni.extension=so
++ppc64.Linux.gpp.executable.extension=
++
++# FIXME to be removed when NAR-6
++ppc64.Linux.gcc.static.extension=a
++ppc64.Linux.gcc.shared.extension=so*
++ppc64.Linux.gcc.plugin.extension=so
++ppc64.Linux.gcc.jni.extension=so
++
++#
++# PPC
++#
++ppc.Linux.linker=g++
++
++ppc.Linux.gpp.cpp.compiler=g++
++ppc.Linux.gpp.cpp.defines=Linux GNU_GCC
++ppc.Linux.gpp.cpp.options=-c -fPIC -pthread -fexceptions -O2 -fno-strict-aliasing -fno-omit-frame-pointer -Wall -Wextra
++ppc.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
++ppc.Linux.gpp.cpp.excludes=
++
++ppc.Linux.gpp.c.compiler=gcc
++ppc.Linux.gpp.c.defines=Linux GNU_GCC
++ppc.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
++ppc.Linux.gpp.c.includes=**/*.c
++ppc.Linux.gpp.c.excludes=
++
++# options for gcc linker front end
++ppc.Linux.gpp.linker.options=-shared -shared-libgcc -fPIC -fexceptions
++ppc.Linux.gpp.linker.sysLibs=stdc++
++ppc.Linux.gpp.linker.libs=
++
++ppc.Linux.gpp.java.include=include;include/linux
++ppc.Linux.gpp.java.runtimeDirectory=jre/lib/ppc/client
++
++ppc.Linux.gpp.lib.prefix=lib
++ppc.Linux.gpp.shared.prefix=lib
++ppc.Linux.gpp.static.extension=a
++ppc.Linux.gpp.shared.extension=so
++ppc.Linux.gpp.plugin.extension=so
++ppc.Linux.gpp.jni.extension=so
++ppc.Linux.gpp.executable.extension=
++
++# FIXME to be removed when NAR-6
++ppc.Linux.gcc.static.extension=a
++ppc.Linux.gcc.shared.extension=so*
++ppc.Linux.gcc.plugin.extension=so
++ppc.Linux.gcc.jni.extension=so
++
++
++#
++# S390x
++#
++s390x.Linux.linker=g++
++
++s390x.Linux.gpp.cpp.compiler=g++
++s390x.Linux.gpp.cpp.defines=Linux GNU_GCC
++s390x.Linux.gpp.cpp.options=-c -fPIC -pthread -fexceptions -O2 -fno-strict-aliasing -fno-omit-frame-pointer -Wall -Wextra
++s390x.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
++s390x.Linux.gpp.cpp.excludes=
++
++s390x.Linux.gpp.c.compiler=gcc
++s390x.Linux.gpp.c.defines=Linux GNU_GCC
++s390x.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
++s390x.Linux.gpp.c.includes=**/*.c
++s390x.Linux.gpp.c.excludes=
++
++# options for gcc linker front end
++s390x.Linux.gpp.linker.options=-shared -shared-libgcc -fPIC -fexceptions
++s390x.Linux.gpp.linker.sysLibs=stdc++
++s390x.Linux.gpp.linker.libs=
++
++s390x.Linux.gpp.java.include=include;include/linux
++s390x.Linux.gpp.java.runtimeDirectory=jre/lib/s390x/client
++
++s390x.Linux.gpp.lib.prefix=lib
++s390x.Linux.gpp.shared.prefix=lib
++s390x.Linux.gpp.static.extension=a
++s390x.Linux.gpp.shared.extension=so
++s390x.Linux.gpp.plugin.extension=so
++s390x.Linux.gpp.jni.extension=so
++s390x.Linux.gpp.executable.extension=
++
++# FIXME to be removed when NAR-6
++s390x.Linux.gcc.static.extension=a
++s390x.Linux.gcc.shared.extension=so*
++s390x.Linux.gcc.plugin.extension=so
++s390x.Linux.gcc.jni.extension=so
++
++#
++# S390
++#
++s390.Linux.linker=g++
++
++s390.Linux.gpp.cpp.compiler=g++
++s390.Linux.gpp.cpp.defines=Linux GNU_GCC
++s390.Linux.gpp.cpp.options=-c -fPIC -pthread -fexceptions -O2 -fno-strict-aliasing -fno-omit-frame-pointer -Wall -Wextra
++s390.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
++s390.Linux.gpp.cpp.excludes=
++
++s390.Linux.gpp.c.compiler=gcc
++s390.Linux.gpp.c.defines=Linux GNU_GCC
++s390.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
++s390.Linux.gpp.c.includes=**/*.c
++s390.Linux.gpp.c.excludes=
++
++# options for gcc linker front end
++s390.Linux.gpp.linker.options=-shared -shared-libgcc -fPIC -fexceptions
++s390.Linux.gpp.linker.sysLibs=stdc++
++s390.Linux.gpp.linker.libs=
++
++s390.Linux.gpp.java.include=include;include/linux
++s390.Linux.gpp.java.runtimeDirectory=jre/lib/s390/client
++
++s390.Linux.gpp.lib.prefix=lib
++s390.Linux.gpp.shared.prefix=lib
++s390.Linux.gpp.static.extension=a
++s390.Linux.gpp.shared.extension=so
++s390.Linux.gpp.plugin.extension=so
++s390.Linux.gpp.jni.extension=so
++s390.Linux.gpp.executable.extension=
++
++# FIXME to be removed when NAR-6
++s390.Linux.gcc.static.extension=a
++s390.Linux.gcc.shared.extension=so*
++s390.Linux.gcc.plugin.extension=so
++s390.Linux.gcc.jni.extension=so
++
++#
++# Aarch64
++#
++aarch64.Linux.linker=g++
++
++aarch64.Linux.gpp.cpp.compiler=g++
++aarch64.Linux.gpp.cpp.defines=Linux GNU_GCC
++aarch64.Linux.gpp.cpp.options=-c -fPIC -pthread -fexceptions -O2 -fno-strict-aliasing -fno-omit-frame-pointer -Wall -Wextra
++aarch64.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
++aarch64.Linux.gpp.cpp.excludes=
++
++aarch64.Linux.gpp.c.compiler=gcc
++aarch64.Linux.gpp.c.defines=Linux GNU_GCC
++aarch64.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
++aarch64.Linux.gpp.c.includes=**/*.c
++aarch64.Linux.gpp.c.excludes=
++
++# options for gcc linker front end
++aarch64.Linux.gpp.linker.options=-shared -shared-libgcc -fPIC -fexceptions
++aarch64.Linux.gpp.linker.sysLibs=stdc++
++aarch64.Linux.gpp.linker.libs=
++
++aarch64.Linux.gpp.java.include=include;include/linux
++aarch64.Linux.gpp.java.runtimeDirectory=jre/lib/aarch64/client
++
++aarch64.Linux.gpp.lib.prefix=lib
++aarch64.Linux.gpp.shared.prefix=lib
++aarch64.Linux.gpp.static.extension=a
++aarch64.Linux.gpp.shared.extension=so
++aarch64.Linux.gpp.plugin.extension=so
++aarch64.Linux.gpp.jni.extension=so
++aarch64.Linux.gpp.executable.extension=
++
++# FIXME to be removed when NAR-6
++aarch64.Linux.gcc.static.extension=a
++aarch64.Linux.gcc.shared.extension=so*
++aarch64.Linux.gcc.plugin.extension=so
++aarch64.Linux.gcc.jni.extension=so
++
More information about the scm-commits
mailing list