[native-platform] Fix build
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Oct 21 11:13:42 UTC 2014
commit 74b2b7445794816fbb3318aa1dc779ae4c541ed0
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Oct 21 12:25:20 2014 +0200
Fix build
native-platform-0.7-Makefile | 6 +++---
native-platform.spec | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/native-platform-0.7-Makefile b/native-platform-0.7-Makefile
index 87df079..04f58d6 100644
--- a/native-platform-0.7-Makefile
+++ b/native-platform-0.7-Makefile
@@ -7,8 +7,8 @@
CXX=g++
STRIP=strip
# which is the best solution?
-#JOPT_JAR=$(shell build-classpath jopt-simple.jar)
-JOPT_JAR=$(shell locate jopt-simple.jar)
+JOPT_JAR=$(shell build-classpath jopt-simple)
+#JOPT_JAR=$(shell locate jopt-simple.jar)
IDIR=src/shared/headers
SRCDIR=src/main/cpp
#SRCSHAREDIR=src/shared/cpp
@@ -84,4 +84,4 @@ $(IGEN)/native.h: $(JCLASSESDIR)/%.class
clean:
-rm javafiles-list
- -rm -Rf $(BUILD)
\ No newline at end of file
+ -rm -Rf $(BUILD)
diff --git a/native-platform.spec b/native-platform.spec
index 650ad98..b9bb5b5 100644
--- a/native-platform.spec
+++ b/native-platform.spec
@@ -85,10 +85,10 @@ sed -i.javadoc8 "s|jar javadoc arch-jar|jar arch-jar|" Makefile
%if %{bits} == 64
%mvn_file net.rubygrapefruit:%{name}-linux-amd64 %{name}-linux
-%mvn_artifact %{SOURCE3} %{name}-linux.jar
+%mvn_artifact %{SOURCE3} build/%{name}-linux.jar
%else
%mvn_file net.rubygrapefruit:%{name}-linux-i386 %{name}-linux
-%mvn_artifact %{SOURCE2} %{name}-linux.jar
+%mvn_artifact %{SOURCE2} build/%{name}-linux.jar
%endif
%mvn_file net.rubygrapefruit:%{name} %{name}
%mvn_artifact pom.xml build/%{name}.jar
@@ -119,6 +119,9 @@ install -pm 0755 build/binaries/libnative-platform.so %{buildroot}%{_libdir}/%{n
%endif
%changelog
+* Tue Oct 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10-1
+- Fix build
+
* Fri Oct 17 2014 gil cattaneo <puntogil at libero.it> 0.10-1
- update to 0.10
More information about the scm-commits
mailing list