Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

rel=5. Fix DLL linking with another DLL on Windows.

Browse Source 
Signed-off-by: ofry <tim4job@bmail.ru>
This commit is contained in:
ofry
2020-08-15 21:22:20 +03:00
parent d67ba656b9
commit ba17b33e13
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mingw-w64-bmake/0004-add-windows-draft-configs.patch
View File

@@ -9,18 +9,19 @@ index a6bf9a2..fa50e79 100644
+sys/MSYS.mk
sys/NetBSD.mk
diff --git a/mk/sys/MINGW32.mk b/mk/sys/MINGW32.mk
index 10da919..470b3b0 100644
index 10da919..9d04333 100644
--- a/mk/sys/MINGW32.mk
+++ b/mk/sys/MINGW32.mk
@@ -1,2 +1,2 @@
-# $Id: Linux.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $
+# $Id: MINGW32.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $
# $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $
@@ -14,5 +14,13 @@ NEED_SOLINKS=yes
@@ -14,5 +14,14 @@ NEED_SOLINKS=yes
+LD_X=
+LD_x=
+SHLIB_LD = ${CC}
+SHLIB_LDADD?= ${LDADD}
+
.SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4
@@ -31,25 +32,26 @@ index 10da919..470b3b0 100644
+HOST_LIBEXT = .dll
+DSHLIBEXT = .dll
@@ -21,2 +29,5 @@ ARFLAGS= rl
@@ -21,2 +30,5 @@ ARFLAGS= rl
RANLIB= ranlib
+LD_shared= -Bshareable -shared
+LD_so= dll.${SHLIB_FULLVERSION}
+LD_solink= dll
diff --git a/mk/sys/MINGW64.mk b/mk/sys/MINGW64.mk
index 10da919..3caac1c 100644
index 10da919..793b169 100644
--- a/mk/sys/MINGW64.mk
+++ b/mk/sys/MINGW64.mk
@@ -1,2 +1,2 @@
-# $Id: Linux.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $
+# $Id: MINGW64.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $
# $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $
@@ -14,5 +14,13 @@ NEED_SOLINKS=yes
@@ -14,5 +14,14 @@ NEED_SOLINKS=yes
+LD_X=
+LD_x=
+SHLIB_LD = ${CC}
+SHLIB_LDADD?= ${LDADD}
+
.SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4
@@ -60,25 +62,26 @@ index 10da919..3caac1c 100644
+HOST_LIBEXT = .dll
+DSHLIBEXT = .dll
@@ -21,2 +29,5 @@ ARFLAGS= rl
@@ -21,2 +30,5 @@ ARFLAGS= rl
RANLIB= ranlib
+LD_shared= -Bshareable -shared
+LD_so= dll.${SHLIB_FULLVERSION}
+LD_solink= dll
diff --git a/mk/sys/MSYS.mk b/mk/sys/MSYS.mk
index 10da919..510002f 100644
index 10da919..16b3b53 100644
--- a/mk/sys/MSYS.mk
+++ b/mk/sys/MSYS.mk
@@ -1,2 +1,2 @@
-# $Id: Linux.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $
+# $Id: MSYS.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $
# $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $
@@ -14,5 +14,13 @@ NEED_SOLINKS=yes
@@ -14,5 +14,14 @@ NEED_SOLINKS=yes
+LD_X=
+LD_x=
+SHLIB_LD = ${CC}
+SHLIB_LDADD?= ${LDADD}
+
.SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4
@@ -89,7 +92,7 @@ index 10da919..510002f 100644
+HOST_LIBEXT = .dll
+DSHLIBEXT = .dll
@@ -21,2 +29,5 @@ ARFLAGS= rl
@@ -21,2 +30,5 @@ ARFLAGS= rl
RANLIB= ranlib
+LD_shared= -Bshareable -shared
+LD_so= dll.${SHLIB_FULLVERSION}

2
mingw-w64-bmake/PKGBUILD
View File

@@ -8,7 +8,7 @@ _realname=bmake
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=20181221
pkgrel=4
pkgrel=5
pkgdesc='Portable version of the NetBSD make build tool'
arch=('any')
url='http://www.crufty.net/help/sjg/bmake.html'