Bug 549492 - Build of native component on Linux does not respect CFLAGS/LDFLAGS
Change the makefile to honour the value of these variables
if they are set in the environment.
Change-Id: Ieb777fa5e1d61ee49c23620baafb8a8a24fe9e8a
Signed-off-by: Mat Booth <mat.booth@redhat.com>
diff --git a/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/MANIFEST.MF
index 5ae9f66..6d0152f 100644
--- a/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName
Bundle-SymbolicName: org.eclipse.equinox.security.linux.x86_64;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile b/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile
index c255161..5606a4c 100644
--- a/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile
+++ b/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile
@@ -1,18 +1,19 @@
LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1`
LIBSECRET_LIBS = `pkg-config --libs libsecret-1`
-CFLAGS = -shared -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux"
+CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" $(LIBSECRET_CFLAGS)
+LDFLAGS := $(LDFLAGS) -shared $(LIBSECRET_LIBS)
all: ../libkeystorelinuxnative.so
clean:
rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o
-
-../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o
- $(CC) $(CFLAGS) -o $@ $< $(LIBSECRET_LIBS)
-
-../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c
- $(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c
-../target:
+../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o
+ $(CC) $(LDFLAGS) -o $@ $<
+
+../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c
+ $(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c
+
+../target:
mkdir -p ../target
diff --git a/bundles/org.eclipse.equinox.security.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.security.linux.x86_64/pom.xml
index 0a08b98..1c06d9b 100644
--- a/bundles/org.eclipse.equinox.security.linux.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.security.linux.x86_64/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.security.linux.x86_64</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>