summaryrefslogtreecommitdiff
path: root/dev-lua/luaexpat/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-lua/luaexpat/files
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-lua/luaexpat/files')
-rw-r--r--dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch27
-rw-r--r--dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch13
2 files changed, 13 insertions, 27 deletions
diff --git a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch b/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
deleted file mode 100644
index 754fe27c8419..000000000000
--- a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- makefile.bak 2012-03-01 13:44:47.000000000 +0100
-+++ makefile 2012-03-01 13:45:50.000000000 +0100
-@@ -12,17 +12,17 @@
- lib: src/$(LIBNAME)
-
- src/$(LIBNAME) : $(OBJS)
-- export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
-+ export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(LDFLAGS) $(OBJS) -lexpat
-
- $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
-- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-+ $(CC) -c $(CFLAGS) $(LDFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-
- install:
-- mkdir -p $(LUA_LIBDIR)
-- cp src/$(LIBNAME) $(LUA_LIBDIR)
-- cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-- mkdir -p $(LUA_DIR)/$T
-- cp src/$T/lom.lua $(LUA_DIR)/$T
-+ mkdir -p $(DESTDIR)$(LUA_LIBDIR)
-+ cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR)
-+ cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-+ mkdir -p $(DESTDIR)$(LUA_DIR)/$T
-+ cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T
-
- clean:
- rm -f src/$(LIBNAME) $(OBJS)
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
new file mode 100644
index 000000000000..95de7be60690
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 1a5a145..df09239 100644
+--- a/makefile
++++ b/makefile
+@@ -45,7 +45,7 @@ OBJS= src/lxplib.o
+ lib: src/$(LIBNAME)
+
+ src/$(LIBNAME) : $(OBJS)
+- $(CC) $(CFLAGS) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
++ $(CC) $(LDFLAGS) $(CFLAGS) -fPIC -std=gnu99 -ansi -I$(LUA_INC) -I$(EXPAT_INC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
+
+ install:
+ mkdir -p $(LUA_LIBDIR)