[packages] Fix linking of libsdl_{mixer,sound}
git-svn-id: svn://svn.openwrt.org/openwrt/packages@20257 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
18e6a58967
commit
82e1a29c70
@ -20,6 +20,8 @@ PKG_INSTALL:=1
|
|||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
TARGET_LDFLAGS += -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
|
||||||
|
|
||||||
define Package/libsdl-mixer
|
define Package/libsdl-mixer
|
||||||
SECTION:=libs
|
SECTION:=libs
|
||||||
CATEGORY:=Libraries
|
CATEGORY:=Libraries
|
||||||
|
17
libs/libsdl_mixer/patches/001-fix-linking.patch
Normal file
17
libs/libsdl_mixer/patches/001-fix-linking.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
|
index 76fdd3c..3ab4939 100644
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -75,10 +75,10 @@ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
|
||||||
|
$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
|
||||||
|
|
||||||
|
$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
|
||||||
|
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
|
||||||
|
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
|
||||||
|
|
||||||
|
$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
|
||||||
|
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
|
||||||
|
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
|
||||||
|
|
||||||
|
install: all install-hdrs install-lib #install-bin
|
||||||
|
install-hdrs:
|
@ -20,6 +20,8 @@ PKG_INSTALL:=1
|
|||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
TARGET_LDFLAGS += -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
|
||||||
|
|
||||||
define Package/libsdl-sound
|
define Package/libsdl-sound
|
||||||
SECTION:=libs
|
SECTION:=libs
|
||||||
CATEGORY:=Libraries
|
CATEGORY:=Libraries
|
||||||
|
Loading…
x
Reference in New Issue
Block a user