| 1 |
bicatali 09/04/16 17:39:58 |
| 2 |
|
| 3 |
Added: liborigin-20080225-makefile.patch |
| 4 |
Log: |
| 5 |
Bunch of QA fixes, removed tree.hh now in main tree |
| 6 |
(Portage version: 2.2_rc30/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-libs/liborigin/files/liborigin-20080225-makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/liborigin/files/liborigin-20080225-makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/liborigin/files/liborigin-20080225-makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: liborigin-20080225-makefile.patch |
| 15 |
=================================================================== |
| 16 |
--- Makefile.LINUX.orig 2008-02-25 10:20:26.000000000 +0000 |
| 17 |
+++ Makefile.LINUX 2009-04-16 18:36:21.634506850 +0100 |
| 18 |
@@ -5,15 +5,14 @@ |
| 19 |
TARGET3 = $(TARGET0).0.0.4 |
| 20 |
OPJ = OPJFile |
| 21 |
OPJ2DAT = opj2dat |
| 22 |
-CC = g++ |
| 23 |
-CFLAGS = -pipe -Wall -W -O2 -fPIC |
| 24 |
-LDFLAGS = -shared -Wl,-soname,$(TARGET1) |
| 25 |
+MYCXXFLAGS = -pipe -Wall -W -fPIC |
| 26 |
+MYLDFLAGS = -shared -Wl,-soname,$(TARGET1) |
| 27 |
LIBEXT = `./lib-arch.sh` |
| 28 |
all : $(TARGET0) $(OPJ2DAT) |
| 29 |
|
| 30 |
$(TARGET0) : $(OPJ).cpp $(OPJ).h |
| 31 |
- $(CC) -c $(CFLAGS) $(OPJ).cpp -o $(OPJ).o |
| 32 |
- $(CC) $(LDFLAGS) -o $(TARGET3) $(OPJ).o |
| 33 |
+ $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $(OPJ).cpp -o $(OPJ).o |
| 34 |
+ $(CXX) $(LDFLAGS) $(MYLDFLAGS) $(OPJ).o -o $(TARGET3) |
| 35 |
mkdir -p lib |
| 36 |
chmod 644 $(TARGET3) |
| 37 |
mv -f $(TARGET3) lib/ |
| 38 |
@@ -22,8 +21,9 @@ |
| 39 |
ln -sf $(TARGET3) $(TARGET1);\ |
| 40 |
ln -sf $(TARGET3) $(TARGET2)) |
| 41 |
|
| 42 |
-$(OPJ2DAT): $(OPJ2DAT).cpp |
| 43 |
- $(CC) $(CFLAGS) -L lib/ -o $(OPJ2DAT) -lorigin $(OPJ2DAT).cpp |
| 44 |
+$(OPJ2DAT): $(OPJ2DAT).cpp |
| 45 |
+ $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $(OPJ2DAT).cpp -o $(OPJ2DAT).o |
| 46 |
+ $(CXX) $(LDFLAGS) $(MYLDFLAGS) $(OPJ2DAT).o -Llib -lorigin -o $(OPJ2DAT) |
| 47 |
|
| 48 |
clean : |
| 49 |
rm -f *~ *.o $(OPJ2DAT) $(TARGET0)* |
| 50 |
@@ -36,9 +36,9 @@ |
| 51 |
chmod 755 $(OPJ2DAT) |
| 52 |
cp $(OPJ2DAT) $(DESTDIR)/usr/bin |
| 53 |
mkdir -p $(DESTDIR)/usr/include/$(TARGET) |
| 54 |
- chmod 644 $(OPJ).h tree.hh |
| 55 |
- cp $(OPJ).h tree.hh $(DESTDIR)/usr/include/$(TARGET) |
| 56 |
- ldconfig |
| 57 |
+ chmod 644 $(OPJ).h |
| 58 |
+ cp $(OPJ).h $(DESTDIR)/usr/include/$(TARGET) |
| 59 |
+ |
| 60 |
uninstall: |
| 61 |
rm -f $(DESTDIR)/usr/$(LIBEXT)/$(TARGET0)* $(DESTDIR)/usr/bin/$(OPJ2DAT) $(DESTDIR)/usr/include/$(TARGET)/$(OPJ).h |
| 62 |
ldconfig |
Archives