diff options
author | Mat Booth | 2019-07-23 16:02:01 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-07-29 12:49:07 +0000 |
commit | bf4f0806255e1c3a2c0817f0d1965ba3707d6f69 (patch) | |
tree | 54b8b9882bc9bb07100510a040c5835fa4fbad7f | |
parent | f0c079c8739042aa147df884e8474cc6c056ef35 (diff) | |
download | rt.equinox.bundles-Y20190730-0055.tar.gz rt.equinox.bundles-Y20190730-0055.tar.xz rt.equinox.bundles-Y20190730-0055.zip |
Bug 549492 - Build of native component on Linux does not respect CFLAGS/LDFLAGSY20190808-0900Y20190805-0900Y20190801-0900Y20190730-0135Y20190730-0055Y20190729-0900I20190811-1800I20190810-1800I20190809-1800I20190808-1800I20190807-1800I20190806-1800I20190805-1800I20190804-1800I20190803-1800I20190802-1800I20190801-1800I20190801-0600I20190731-1800I20190730-1800I20190729-1800
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>
3 files changed, 9 insertions, 8 deletions
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 5ae9f66d8..6d0152f6b 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 @@ Manifest-Version: 1.0 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 c2551614c..5606a4c3f 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) - + $(CC) $(LDFLAGS) -o $@ $< + ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c - $(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c + $(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c -../target: +../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 0a08b980e..1c06d9b08 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> |