diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-04-02 00:05:37 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-01-11 18:56:23 -0800 |
| commit | 4b2bdd01998aafd9eea660b8aab8615424106cdb (patch) | |
| tree | 5718fe239b26503a2910b07ce45c78ad02119132 | |
| parent | 2605babc8b059783399071945c69698a4d4a3ab8 (diff) | |
luasocket: Replace -fpic with $(FPIC)
This is causing linking errors on i386 and ppc.
Also removed custom warnings an optimization levels that override stock
settings.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from ecb4fcca0c30d38285a35b1a33eac00927caa792)
| -rw-r--r-- | lang/luasocket/Makefile | 4 | ||||
| -rw-r--r-- | lang/luasocket/patches/040-remove-fpic-and-warnings.patch | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/lang/luasocket/Makefile b/lang/luasocket/Makefile index e97c1a521..1570ba2f1 100644 --- a/lang/luasocket/Makefile +++ b/lang/luasocket/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasocket PKG_SOURCE_VERSION:=6d5e40c324c84d9c1453ae88e0ad5bdd0a631448 PKG_VERSION:=3.0-rc1-20130909 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/diegonehab/luasocket.git @@ -41,7 +41,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR)/ \ LIBDIR="$(TARGET_LDFLAGS)" \ - CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \ + CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \ LD="$(TARGET_CROSS)ld -shared" \ all endef diff --git a/lang/luasocket/patches/040-remove-fpic-and-warnings.patch b/lang/luasocket/patches/040-remove-fpic-and-warnings.patch new file mode 100644 index 000000000..95c17b143 --- /dev/null +++ b/lang/luasocket/patches/040-remove-fpic-and-warnings.patch @@ -0,0 +1,14 @@ +--- a/src/makefile ++++ b/src/makefile +@@ -163,9 +163,8 @@ DEF_linux=-DLUASOCKET_$(DEBUG) -DLUA_$(COMPAT)_MODULE \ + -DLUASOCKET_API='__attribute__((visibility("default")))' \ + -DUNIX_API='__attribute__((visibility("default")))' \ + -DMIME_API='__attribute__((visibility("default")))' +-CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra \ +- -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden +-LDFLAGS_linux=-O -shared -fpic -o ++CFLAGS_linux= -I$(LUAINC) $(DEF) -fvisibility=hidden ++LDFLAGS_linux=-shared -o + LD_linux=gcc + SOCKET_linux=usocket.o + |