Make it work with CMake 3.17 (thanks Hugo Hromic)

4 files changed, 47 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d94545b646f..abdc7d4ea908 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,25 @@
 pkgbase = mingw-w64-luajit-2.1
 	pkgdesc = Just-in-time compiler and drop-in replacement for Lua 5.1
 	pkgver = 2.1.0.beta3
-	pkgrel = 2
+	pkgrel = 3
 	url = http://luajit.org/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = mingw-w64-gcc
+	makedepends = patch
 	depends = mingw-w64-crt
 	provides = mingw-w64-luajit
 	conflicts = mingw-w64-luajit
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
+	source = https://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz
+	source = 001-make-import-library.patch
+	source = 002-fix-pkg-config-file.patch
 	sha256sums = 1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3
+	sha256sums = 89a044f2da887036e84e843f5e5fc491fcf7ee6fccea407a4607ac3b3f344937
+	sha256sums = 4df486e82b0bbeead01dcf6001e90c51477a3a8ac18611d60d7067f2c7013428
 
 pkgname = mingw-w64-luajit-2.1
 
diff --git a/001-make-import-library.patch b/001-make-import-library.patch
new file mode 100644
index 000000000000..48c823def165
--- /dev/null
+++ b/001-make-import-library.patch
@@ -0,0 +1,11 @@
+--- luajit/src/Makefile.orig	2017-05-01 19:05:00.000000000 +0000
++++ luajit/src/Makefile	2020-05-23 13:44:52.010932510 +0000
+@@ -305,7 +305,7 @@
+ TARGET_SYS?= $(HOST_SYS)
+ ifeq (Windows,$(TARGET_SYS))
+   TARGET_STRIP+= --strip-unneeded
+-  TARGET_XSHLDFLAGS= -shared
++  TARGET_XSHLDFLAGS= -shared -Wl,--out-implib,libluajit-${ABIVER}.dll.a
+   TARGET_DYNXLDOPTS=
+ else
+ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector 2>/dev/null || echo 1))
diff --git a/002-fix-pkg-config-file.patch b/002-fix-pkg-config-file.patch
new file mode 100644
index 000000000000..f62059d33b8c
--- /dev/null
+++ b/002-fix-pkg-config-file.patch
@@ -0,0 +1,9 @@
+--- luajit/etc/luajit.pc.orig	2015-07-13 09:32:17.569800000 +0300
++++ luajit/etc/luajit.pc	2015-07-13 09:32:22.858200000 +0300
+@@ -21,5 +21,5 @@
+ Version: ${version}
+ Requires:
+ Libs: -L${libdir} -l${libname}
+-Libs.private: -Wl,-E -lm -ldl
++Libs.private: -lm -liconv
+ Cflags: -I${includedir}
diff --git a/PKGBUILD b/PKGBUILD
index 10ea6d5fedf5..79e9535df7b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,31 @@
 pkgname=mingw-w64-luajit-2.1
 pkgver=2.1.0.beta3
 pkgfile=${pkgver/.beta/-beta}
-pkgrel=2
+pkgrel=3
 pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1'
 arch=('i686' 'x86_64')
 url='http://luajit.org/'
 license=('MIT')
 depends=(mingw-w64-crt)
-makedepends=(mingw-w64-gcc)
+makedepends=(mingw-w64-gcc patch)
 conflicts=('mingw-w64-luajit')
 provides=('mingw-w64-luajit')
-source=(http://luajit.org/download/LuaJIT-${pkgfile}.tar.gz)
+source=(https://luajit.org/download/LuaJIT-${pkgfile}.tar.gz
+        001-make-import-library.patch
+        002-fix-pkg-config-file.patch)
 options=(!strip !buildflags staticlibs)
-sha256sums=('1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3')
+sha256sums=('1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3'
+            '89a044f2da887036e84e843f5e5fc491fcf7ee6fccea407a4607ac3b3f344937'
+            '4df486e82b0bbeead01dcf6001e90c51477a3a8ac18611d60d7067f2c7013428')
 
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
+prepare() {
+  cd "${srcdir}/LuaJIT-$pkgfile"
+  patch -b -p1 -i ${srcdir}/001-make-import-library.patch
+  patch -b -p1 -i ${srcdir}/002-fix-pkg-config-file.patch
+}
+
 build() {
   unset LDFLAGS
 
@@ -47,12 +57,15 @@ build() {
 package() {
   for _target in ${_targets}; do
       cd ${srcdir}/luajit-build-${_target}
-      mkdir -p $pkgdir/usr/${_target}/lib
+      mkdir -p $pkgdir/usr/${_target}/{bin,lib}
       mkdir -p $pkgdir/usr/${_target}/include/luajit-2.1
-      cp lua51.dll $pkgdir/usr/${_target}/lib/luajit-2.1.dll
+      mkdir -p $pkgdir/usr/${_target}/lib/pkgconfig
+      cp lua51.dll $pkgdir/usr/${_target}/bin/luajit-2.1.dll
       cp src/libluajit.a $pkgdir/usr/${_target}/lib/
+      cp src/libluajit-5.1.dll.a $pkgdir/usr/${_target}/lib/libluajit-2.1.dll.a
       cp src/{lauxlib.h,lua.h,lua.hpp,luaconf.h,luajit.h,lualib.h} $pkgdir/usr/$_target/include/luajit-2.1/
-      ${_target}-strip --strip-unneeded "$pkgdir"/usr/${_target}/lib/*.dll
+      cp etc/luajit.pc "$pkgdir"/usr/${_target}/lib/pkgconfig/
+      ${_target}-strip --strip-unneeded "$pkgdir"/usr/${_target}/bin/*.dll
       ${_target}-strip -g "$pkgdir"/usr/${_target}/lib/*.a
   done
 }