diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-05-18 13:15:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 13:15:05 -0700 |
| commit | 011d5d89dd1a6aa06f737db636a3814d205e6d59 (patch) | |
| tree | 6088d77d12abd9db254519343c40b400a649855b /net | |
| parent | 6a8bf63004192cbb51c4b8bf438cfbfc7c736c37 (diff) | |
| parent | 623d25a86b7e6bd5db68fe8e07c221d3db558360 (diff) | |
Merge pull request #9010 from neheb/quu
quassel-irssi: Fix compilation with GCC8
Diffstat (limited to 'net')
| -rw-r--r-- | net/quassel-irssi/Makefile | 3 | ||||
| -rw-r--r-- | net/quassel-irssi/patches/001-respect-cflags.patch | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/quassel-irssi/Makefile b/net/quassel-irssi/Makefile index 002f52ec1..e1434db61 100644 --- a/net/quassel-irssi/Makefile +++ b/net/quassel-irssi/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quassel-irssi PKG_SOURCE_DATE:=2017-11-30 PKG_SOURCE_VERSION:=079be662dde374a383646256108a4974c2bc7796 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/phhusson/quassel-irssi/tar.gz/$(PKG_SOURCE_VERSION)? @@ -25,6 +25,7 @@ PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk MAKE_PATH := core MAKE_VARS += SYSTEM_QUASSELC=1 IRSSI_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" IRSSI_INCLUDE=$(STAGING_DIR)/usr/include/irssi diff --git a/net/quassel-irssi/patches/001-respect-cflags.patch b/net/quassel-irssi/patches/001-respect-cflags.patch index aeaf6d41f..291bed499 100644 --- a/net/quassel-irssi/patches/001-respect-cflags.patch +++ b/net/quassel-irssi/patches/001-respect-cflags.patch @@ -14,7 +14,7 @@ endif -CFLAGS=-std=gnu11 -Wall -Wextra -Werror -g -O2 $(IRSSI_CFLAGS) $(QUASSELC_FLAGS) -Wmissing-prototypes -Wmissing-declarations -+CFLAGS+=-std=gnu11 -Wall -Wextra -Werror -g $(IRSSI_CFLAGS) $(QUASSELC_FLAGS) -Wmissing-prototypes -Wmissing-declarations ++CFLAGS+=-std=gnu11 -Wall -Wextra -g $(IRSSI_CFLAGS) $(QUASSELC_FLAGS) -Wmissing-prototypes -Wmissing-declarations CFLAGS += $(SSL_CFLAGS) LDFLAGS+= $(SSL_LDLAGS) |