diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2010-07-17 00:05:38 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-07-17 00:05:38 +0000 |
commit | 0b4194a418b8b2661ff8b0f8bc3ddd32ecaeb553 (patch) | |
tree | 2f1a223132c04499fddb3cac7aeb8ac0edba3195 /media-libs/libjsw/files | |
parent | old (diff) | |
download | historical-0b4194a418b8b2661ff8b0f8bc3ddd32ecaeb553.tar.gz historical-0b4194a418b8b2661ff8b0f8bc3ddd32ecaeb553.tar.bz2 historical-0b4194a418b8b2661ff8b0f8bc3ddd32ecaeb553.zip |
old
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'media-libs/libjsw/files')
-rw-r--r-- | media-libs/libjsw/files/libjsw-1.5.6-build.patch | 109 |
1 files changed, 0 insertions, 109 deletions
diff --git a/media-libs/libjsw/files/libjsw-1.5.6-build.patch b/media-libs/libjsw/files/libjsw-1.5.6-build.patch deleted file mode 100644 index 2f554fd332c3..000000000000 --- a/media-libs/libjsw/files/libjsw-1.5.6-build.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- libjsw/Makefile.old 2006-05-29 18:49:16.000000000 +0200 -+++ libjsw/Makefile 2006-05-29 18:58:27.000000000 +0200 -@@ -51,10 +51,10 @@ - # to debug the program. - # - --CFLAGS = -Wall -O2 -g --CFLAGS += -ffast-math -+CFLAGS += -fPIC -+CXXFLAGS += -fPIC - --CPPFLAGS = -D__cplusplus -+CPPFLAGS += -D__cplusplus - - - # ######################################################################## -@@ -82,11 +82,9 @@ - OBJ_C = $(SRC_C:.c=.o) - OBJ_CPP = $(SRC_CPP:.cpp=.o) - .c.o: -- @echo "Compiling module $*.o" -- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) -+ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) - .cpp.o: -- @echo "Compiling module $*.o" -- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) -+ $(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS) - - - # ######################################################################## -@@ -95,12 +93,7 @@ - $(LIB): prebuild modules postbuild - - modules: $(OBJ_C) $(OBJ_CPP) -- @echo -n "Linking modules..." -- @$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS) -- @echo -n " " -- @$(RM) $(RMFLAGS) $(LIBPFX).so -- @$(LINK) -s $(LIB) $(LIBPFX).so -- @-$(LS) $(LSFLAGS) $(LIB) -+ $(CPP) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LDFLAGS) $(LIBS) $(LIB_DIRS) - - prebuild: - @echo "Building library \"$(LIB)\"..." ---- jscalibrator/Makefile.old 2006-05-29 19:01:28.000000000 +0200 -+++ jscalibrator/Makefile 2006-05-29 19:05:54.000000000 +0200 -@@ -59,9 +59,6 @@ - #CFLAGS = -Wall -O -g \ - # `gtk-config --cflags` - --CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops -ffast-math \ -- `gtk-config --cflags` -- - CPPFLAGS = -D__cplusplus - - -@@ -76,7 +73,7 @@ - # to the LIB line depending on what you have set in the CFLAGS line - # farther above. - # --LIBS = -ljsw `gtk-config --libs` -+LIBS := -ljsw $(shell gtk-config --libs) - - # Library Directories: - # -@@ -85,7 +82,7 @@ - # Each argument is of the format -L<dir> where <dir> is the full - # path to the directory. - # --LIB_DIRS = -+LIB_DIRS = -L../libjsw - - # Header File Directories: - # -@@ -95,7 +92,7 @@ - # Each argument is of the format -I<dir> where <dir> is the full - # path to the directory. - # --INC_DIRS = -+INC_DIRS = $(shell gtk-config --cflags) -I../libjsw - - - # ######################################################################## -@@ -117,11 +114,9 @@ - OBJ_C = $(SRC_C:.c=.o) - OBJ_CPP = $(SRC_CPP:.cpp=.o) - .c.o: -- @echo "Compiling module $*.o" -- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) -+ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) - .cpp.o: -- @echo "Compiling module $*.o" -- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) -+ $(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS) - - - # ######################################################################## -@@ -130,10 +125,7 @@ - $(BIN): prebuild modules postbuild - - modules: $(OBJ_C) $(OBJ_CPP) -- @echo -n "Linking modules..." -- @$(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) -- @echo -n " " -- @-$(LS) $(LSFLAGS) $(BIN) -+ $(CC) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LDFLAGS) $(LIB_DIRS) $(LIBS) - - prebuild: - @echo "Building program \"$(BIN)\"..." |