| 1 |
hasufell 12/08/21 18:33:20 |
| 2 |
|
| 3 |
Added: nqc-3.1_p6-flags.patch |
| 4 |
Log: |
| 5 |
respect flags wrt #432200 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-lang/nqc/files/nqc-3.1_p6-flags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/nqc/files/nqc-3.1_p6-flags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/nqc/files/nqc-3.1_p6-flags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nqc-3.1_p6-flags.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Tue Aug 21 18:14:15 UTC 2012 |
| 19 |
Subject: build system |
| 20 |
|
| 21 |
respect flags |
| 22 |
|
| 23 |
--- Makefile |
| 24 |
+++ Makefile |
| 25 |
@@ -67,7 +67,7 @@ |
| 26 |
|
| 27 |
# CFLAGS |
| 28 |
#CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes |
| 29 |
-CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall |
| 30 |
+CXXFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall |
| 31 |
|
| 32 |
USBOBJ = rcxlib/RCX_USBTowerPipe_none.o |
| 33 |
|
| 34 |
@@ -87,20 +87,20 @@ |
| 35 |
# Linux |
| 36 |
# uncomment this next line if you have the USB tower library installed |
| 37 |
# USBOBJ = rcxlib/RCX_USBTowerPipe_linux.o |
| 38 |
- CFLAGS += -I/usr/local/include/LegoUSB -Wno-deprecated |
| 39 |
+ CXXFLAGS += -I/usr/include/LegoUSB -Wno-deprecated |
| 40 |
else |
| 41 |
ifneq (,$(findstring $(OSTYPE), SunOS)) |
| 42 |
# Solaris |
| 43 |
- CFLAGS += -DSOLARIS |
| 44 |
+ CXXFLAGS += -DSOLARIS |
| 45 |
else |
| 46 |
ifneq (,$(strip $(findstring $(OSTYPE), FreeBSD))) |
| 47 |
# FreeBSD |
| 48 |
USBOBJ = rcxlib/RCX_USBTowerPipe_fbsd.o |
| 49 |
DEFAULT_SERIAL_NAME = "/dev/cuad0" |
| 50 |
- CFLAGS += -Wno-deprecated |
| 51 |
+ CXXFLAGS += -Wno-deprecated |
| 52 |
else |
| 53 |
# default Unix build without USB support |
| 54 |
- CFLAGS += -O6 |
| 55 |
+ CXXFLAGS += -O6 |
| 56 |
endif |
| 57 |
endif |
| 58 |
endif |
| 59 |
@@ -113,7 +113,7 @@ |
| 60 |
ifndef DEFAULT_SERIAL_NAME |
| 61 |
DEFAULT_SERIAL_NAME = "/dev/ttyS0" |
| 62 |
endif |
| 63 |
-CFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)' |
| 64 |
+CXXFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)' |
| 65 |
|
| 66 |
# |
| 67 |
# Object files |
| 68 |
@@ -164,10 +164,10 @@ |
| 69 |
$(MKDIR) bin |
| 70 |
|
| 71 |
bin/nqc : compiler/parse.cpp $(OBJ) |
| 72 |
- $(CXX) -o $@ $(OBJ) $(LIBS) |
| 73 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) |
| 74 |
|
| 75 |
bin/mkdata : mkdata/mkdata.cpp nqc/SRecord.cpp |
| 76 |
- $(CXX) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp |
| 77 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp |
| 78 |
|
| 79 |
# |
| 80 |
# clean up stuff |
| 81 |
@@ -227,7 +227,7 @@ |
| 82 |
# general rule for compiling |
| 83 |
# |
| 84 |
.cpp.o: |
| 85 |
- $(CXX) -c $(CFLAGS) $< -o $*.o |
| 86 |
+ $(CXX) -c $(CXXFLAGS) $< -o $*.o |
| 87 |
|
| 88 |
|
| 89 |
# |
Archives