| 1 |
commit: 1342f2bb11a3347af17db147c557eb9a06b40cf3 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jan 13 14:00:15 2019 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 21 22:51:02 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1342f2bb |
| 7 |
|
| 8 |
dev-lua/lua-openssl: remove unused patch. |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/10821 |
| 12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/lua-openssl-0.4.1-Makefile.patch | 86 ---------------------- |
| 15 |
1 file changed, 86 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch b/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index bf5374ee90c..00000000000 |
| 20 |
--- a/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,86 +0,0 @@ |
| 23 |
-From: Jakub Jirutka <jakub@×××××××.cz> |
| 24 |
- |
| 25 |
-Fix Makefile to respect system CFLAGS, LDFLAGS, and CC provided by environment. |
| 26 |
-Allow to specify pkg-config command using variable, to be friendly with |
| 27 |
-cross-compiling etc. |
| 28 |
- |
| 29 |
-diff --git a/Makefile b/Makefile |
| 30 |
-index 195ef6b..375fb65 100644 |
| 31 |
---- a/Makefile |
| 32 |
-+++ b/Makefile |
| 33 |
-@@ -2,9 +2,10 @@ T=openssl |
| 34 |
- |
| 35 |
- PREFIX ?=/usr/local |
| 36 |
- LIB_OPTION ?= -shared |
| 37 |
-+PKG_CONFIG ?= pkg-config |
| 38 |
- |
| 39 |
- #Lua auto detect |
| 40 |
--LUA_VERSION ?= $(shell pkg-config luajit --print-provides) |
| 41 |
-+LUA_VERSION ?= $(shell $(PKG_CONFIG) luajit --print-provides) |
| 42 |
- ifeq ($(LUA_VERSION),) ############ Not use luajit |
| 43 |
- LUAV ?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)") |
| 44 |
- LUA_CFLAGS ?= -I$(PREFIX)/include/lua$(LUAV) |
| 45 |
-@@ -12,8 +13,8 @@ LUA_LIBS ?= -L$(PREFIX)/lib |
| 46 |
- LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUAV) |
| 47 |
- else |
| 48 |
- LUAV ?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)") |
| 49 |
--LUA_CFLAGS ?= $(shell pkg-config luajit --cflags) |
| 50 |
--LUA_LIBS ?= $(shell pkg-config luajit --libs) |
| 51 |
-+LUA_CFLAGS ?= $(shell $(PKG_CONFIG) luajit --cflags) |
| 52 |
-+LUA_LIBS ?= $(shell $(PKG_CONFIG) luajit --libs) |
| 53 |
- LUA_LIBDIR ?= $(PREFIX)/lib/lua/$(LUAV) |
| 54 |
- endif |
| 55 |
- |
| 56 |
-@@ -22,30 +23,30 @@ SYS := $(shell gcc -dumpmachine) |
| 57 |
- |
| 58 |
- ifneq (, $(findstring linux, $(SYS))) |
| 59 |
- # Do linux things |
| 60 |
--LDFLAGS = -fPIC -lrt -ldl |
| 61 |
--OPENSSL_LIBS ?= $(shell pkg-config openssl --libs) |
| 62 |
--OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags) |
| 63 |
--CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| 64 |
-+LDFLAGS += -fPIC -lrt -ldl |
| 65 |
-+OPENSSL_LIBS ?= $(shell $(PKG_CONFIG) openssl --libs) |
| 66 |
-+OPENSSL_CFLAGS ?= $(shell $(PKG_CONFIG) openssl --cflags) |
| 67 |
-+CFLAGS += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| 68 |
- endif |
| 69 |
- ifneq (, $(findstring apple, $(SYS))) |
| 70 |
- # Do darwin things |
| 71 |
--LDFLAGS = -fPIC -lrt -ldl |
| 72 |
--OPENSSL_LIBS ?= $(shell pkg-config openssl --libs) |
| 73 |
--OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags) |
| 74 |
--CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| 75 |
-+LDFLAGS += -fPIC -lrt -ldl |
| 76 |
-+OPENSSL_LIBS ?= $(shell $(PKG_CONFIG) openssl --libs) |
| 77 |
-+OPENSSL_CFLAGS ?= $(shell $(PKG_CONFIG) openssl --cflags) |
| 78 |
-+CFLAGS += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| 79 |
- endif |
| 80 |
- ifneq (, $(findstring mingw, $(SYS))) |
| 81 |
- # Do mingw things |
| 82 |
- V = $(shell lua -e "v=string.gsub('$(LUAV)','%.','');print(v)") |
| 83 |
--LDFLAGS = -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll |
| 84 |
-+LDFLAGS += -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll |
| 85 |
- LUA_CFLAGS = -DLUA_LIB -DLUA_BUILD_AS_DLL -I$(PREFIX)/include/ |
| 86 |
--CFLAGS = $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| 87 |
-+CFLAGS += $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| 88 |
- endif |
| 89 |
- ifneq (, $(findstring cygwin, $(SYS))) |
| 90 |
- # Do cygwin things |
| 91 |
--OPENSSL_LIBS ?= $(shell pkg-config openssl --libs) |
| 92 |
--OPENSSL_CFLAGS ?= $(shell pkg-config openssl --cflags) |
| 93 |
--CFLAGS = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| 94 |
-+OPENSSL_LIBS ?= $(shell $(PKG_CONFIG) openssl --libs) |
| 95 |
-+OPENSSL_CFLAGS ?= $(shell $(PKG_CONFIG) openssl --cflags) |
| 96 |
-+CFLAGS += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS) |
| 97 |
- endif |
| 98 |
- #custome config |
| 99 |
- ifeq (.config, $(wildcard .config)) |
| 100 |
-@@ -61,7 +62,7 @@ WARN_MOST = -Wall -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnest |
| 101 |
- WARN = -Wall -Wno-unused-value |
| 102 |
- WARN_MIN = |
| 103 |
- CFLAGS += $(WARN_MIN) -DPTHREADS |
| 104 |
--CC= gcc -g $(CFLAGS) -Ideps |
| 105 |
-+CC ?= gcc -g $(CFLAGS) -Ideps |
| 106 |
- |
| 107 |
- |
| 108 |
- OBJS=src/asn1.o src/auxiliar.o src/bio.o src/cipher.o src/cms.o src/compat.o src/crl.o src/csr.o src/dh.o src/digest.o src/dsa.o \ |
Archives