Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

quasselc: fix compilation with newer glib2

Browse source 
Needed to fix LDFLAGS variable.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2020-04-18 17:30:35 -07:00
parent 0266fa2d29
commit 030cc5570c
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/quasselc/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=quasselc PKG_NAME:=quasselc
PKG_SOURCE_DATE:=2017-01-11 PKG_SOURCE_DATE:=2017-01-11
PKG_SOURCE_VERSION:=a0a1e6bd87d3eac68b5369972d1c2035cfe47e94 PKG_SOURCE_VERSION:=a0a1e6bd87d3eac68b5369972d1c2035cfe47e94
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/phhusson/QuasselC/tar.gz/$(PKG_SOURCE_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/phhusson/QuasselC/tar.gz/$(PKG_SOURCE_VERSION)?
@ -43,6 +43,8 @@ define Package/quasselc/description
An implementation of the Quassel protocol in pure C. An implementation of the Quassel protocol in pure C.
endef endef
TARGET_LDFLAGS += -liconv
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/quasselc $(INSTALL_DIR) $(1)/usr/include/quasselc
$(CP) $(PKG_INSTALL_DIR)/usr/include/quasselc/* $(1)/usr/include/quasselc/ $(CP) $(PKG_INSTALL_DIR)/usr/include/quasselc/* $(1)/usr/include/quasselc/

15
libs/quasselc/patches/001-respect-cflags-ldflags.patch
View file

@ -10,7 +10,20 @@
VERSION = 0 VERSION = 0
INSTALL = install INSTALL = install
-LDLIBS:=$(shell pkg-config glib-2.0 --libs) -lz -LDLIBS:=$(shell pkg-config glib-2.0 --libs) -lz
+LDLIBS+=$(shell pkg-config glib-2.0 --libs) -lz +LDFLAGS+=$(shell pkg-config glib-2.0 --libs) -lz
BOTLIBS := -Wl,-rpath,. BOTLIBS := -Wl,-rpath,.
@@ -15,10 +15,10 @@ lib_objects=setters.o getters.o main.o cmds.o negotiation.o io.o symbols.o
all: bot libquasselc.so.$(VERSION) quasselc.pc
libquasselc.so.$(VERSION): $(lib_objects)
- $(CC) -shared -o $@ -Wl,-soname,libquasselc.so.$(SO_VERSION) $^ $(LDLIBS)
+ $(CC) -shared -o $@ -Wl,-soname,libquasselc.so.$(SO_VERSION) $^ $(LDFLAGS)
bot: bot.o display.o libquasselc.so.$(VERSION)
- $(CC) -o $@ $^ $(LDLIBS) $(BOTLIBS)
+ $(CC) -o $@ $^ $(LDFLAGS) $(BOTLIBS)
clean:
rm -f *.o bot libquasselc.so.$(VERSION) quasselc.pc