From c6000c9d9949b3326fb82f02431899ab6774b960 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 16 Dec 2012 11:51:24 +0100 Subject: big cleanup --- opencore-amr/opencore-amr-0.1.1-gentoo-pic.patch | 66 ------------------------ 1 file changed, 66 deletions(-) delete mode 100644 opencore-amr/opencore-amr-0.1.1-gentoo-pic.patch (limited to 'opencore-amr/opencore-amr-0.1.1-gentoo-pic.patch') diff --git a/opencore-amr/opencore-amr-0.1.1-gentoo-pic.patch b/opencore-amr/opencore-amr-0.1.1-gentoo-pic.patch deleted file mode 100644 index 1664ac4..0000000 --- a/opencore-amr/opencore-amr-0.1.1-gentoo-pic.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: opencore-amr/amrnb/Makefile -=================================================================== ---- opencore-amr.orig/amrnb/Makefile -+++ opencore-amr/amrnb/Makefile -@@ -41,6 +41,7 @@ COMMON_OBJS := $(COMMON_SRC:.cpp=.o) - COMMON_OBJS := $(patsubst %,$(COMMON_SRC_DIR)/%, $(COMMON_OBJS)) - - OBJS = wrapper.o $(DEC_OBJS) $(ENC_OBJS) $(COMMON_OBJS) -+SOBJS = $(OBJS:%.o=%.lo) - - #Versioning - MAJOR = 0 -@@ -59,13 +60,19 @@ SHLIB = libopencore-amrnb.$(SHLIB_EXT) - - all: libopencore-amrnb.a $(SHLIB) - --$(SHLIB): $(OBJS) -+$(SHLIB): $(SOBJS) - ifeq ($(shell uname), Darwin) - $(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS) - else - $(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS) - endif - -+%.lo: %.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@ -+ -+%.lo: %.cpp -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@ -+ - libopencore-amrnb.a: $(OBJS) - ar rcs $@ $+ - -Index: opencore-amr/amrwb/Makefile -=================================================================== ---- opencore-amr.orig/amrwb/Makefile -+++ opencore-amr/amrwb/Makefile -@@ -27,6 +27,7 @@ DEC_OBJS := $(DEC_SRC:.cpp=.o) - DEC_OBJS := $(patsubst %,$(DEC_SRC_DIR)/%, $(DEC_OBJS)) - - OBJS = wrapper.o $(DEC_OBJS) -+SOBJS = $(OBJS:%.o=%.lo) - - #Versioning - MAJOR = 0 -@@ -45,13 +46,19 @@ SHLIB = libopencore-amrwb.$(SHLIB_EXT) - - all: libopencore-amrwb.a $(SHLIB) - --$(SHLIB): $(OBJS) -+$(SHLIB): $(SOBJS) - ifeq ($(shell uname), Darwin) - $(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS) - else - $(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS) - endif - -+%.lo: %.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@ -+ -+%.lo: %.cpp -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@ -+ - libopencore-amrwb.a: $(OBJS) - ar rcs $@ $+ - -- cgit v1.2.3-24-g4f1b