Attachment 630382 Details for Bug 868486 – Upstreamable: don't override user provided CFLAGS and LDFLAGS

[patch] Upstreamable: don't override user provided CFLAGS and LDFLAGS

thermostat-buildflags.patch (text/plain), 2.00 KB, created by Ville Skyttä on 2012-10-20 09:37:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2012-10-20 09:37:43 UTC

Size: 2.00 KB

patch

obsolete

># HG changeset patch
># User Ville SkyttÃ¤ <ville.skytta@iki.fi>
># Date 1350724912 -10800
># Node ID c232611d6d97632d93c3d3e22b8391b2e6037d9f
># Parent  da7f134762f6b2a0b46ad3e7eeeea01853c00fe2
>Don't override user provided CFLAGS and LDFLAGS.
>
>diff -r da7f134762f6 -r c232611d6d97 agent/core/Makefile
>--- a/agent/core/Makefile	Fri Oct 19 21:58:18 2012 +0200
>+++ b/agent/core/Makefile	Sat Oct 20 12:21:52 2012 +0300
>@@ -1,7 +1,7 @@
> CC         = gcc
> JAVAH      = javah
>-CFLAGS     = -c -Wall -fPIC
>-LDFLAGS    = -fPIC -shared
>+MYCFLAGS   = -c -Wall -fPIC
>+MYLDFLAGS  = -fPIC -shared
> COPY       = cp -a
> 
> CLASSPATH  = target/classes/
>@@ -27,10 +27,10 @@
> 	$(COPY) $(SOURCES) $(TARGET)
> 
> $(EXECUTABLE): $(OBJECTS)
>-	$(CC) $(OBJECTS) -o  $(TARGET_DIR)/$@ $(LDFLAGS)
>+	$(CC) $(OBJECTS) -o $(TARGET_DIR)/$@ $(MYLDFLAGS) $(LDFLAGS)
> 
> .c.o:
>-	$(CC) $(CFLAGS) $(INCLUDE)  $< -o $@
>+	$(CC) $(MYCFLAGS) $(CFLAGS) $(INCLUDE) $< -o $@
> 
> clean-lib:
> 	rm $(TARGET_DIR)/$(EXECUTABLE)
>diff -r da7f134762f6 -r c232611d6d97 keyring/Makefile
>--- a/keyring/Makefile	Fri Oct 19 21:58:18 2012 +0200
>+++ b/keyring/Makefile	Sat Oct 20 12:21:52 2012 +0300
>@@ -1,7 +1,7 @@
> CC         = gcc
> JAVAH      = javah
>-CFLAGS     = -c -Wall -fPIC
>-LDFLAGS    = -fPIC -shared
>+MYCFLAGS   = -c -Wall -fPIC
>+MYLDFLAGS  = -fPIC -shared
> COPY       = cp -a
> 
> CLASSPATH  = target/classes/
>@@ -14,8 +14,8 @@
> 
> EXECUTABLE = libGnomeKeyringWrapper.so
> 
>-CFLAGS     += `pkg-config --cflags gnome-keyring-1`
>-LDFLAGS    += `pkg-config --libs gnome-keyring-1`
>+MYCFLAGS   += `pkg-config --cflags gnome-keyring-1`
>+MYLDFLAGS  += `pkg-config --libs gnome-keyring-1`
> 
> .phoni:
> JNI_LIST = com.redhat.thermostat.utils.keyring.GnomeKeyringLibraryNative
>@@ -30,10 +30,10 @@
> 	$(COPY) $(SOURCES) $(TARGET)
> 
> $(EXECUTABLE): $(OBJECTS)
>-	$(CC) $(OBJECTS) -o  $(TARGET_DIR)/$@ $(LDFLAGS)
>+	$(CC) $(OBJECTS) -o $(TARGET_DIR)/$@ $(MYLDFLAGS) $(LDFLAGS)
> 
> .c.o:
>-	$(CC) $(CFLAGS) $(INCLUDE)  $< -o $@
>+	$(CC) $(MYCFLAGS) $(CFLAGS) $(INCLUDE) $< -o $@
> 
> clean-lib:
> 	rm $(TARGET_DIR)/$(EXECUTABLE)

Actions: View | Diff

Attachments on bug 868486: 630382 | 630385