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

gnutls: Rebuild as cygwin

Browse Source 
* Remove msysize patch by building for cygwin
* Backport weak symbol patch as with all gnulib users
* Remove install script in favor of hooks
This commit is contained in:
Biswapriyo Nath
2022-01-28 20:40:59 +05:30
parent 987d021712
commit 3a3fc22af7
4 changed files with 18 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gnutls/PKGBUILD
View File

@@ -4,7 +4,7 @@ pkgbase=gnutls
pkgname=('gnutls' 'libgnutls' 'libgnutls-devel')
_base_ver=3.7.2
pkgver=${_base_ver}
pkgrel=1
pkgrel=2
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('x86_64' 'i686')
license=('GPL3' 'LGPL2.1')
@@ -23,23 +23,25 @@ makedepends=('gtk-doc'
'zlib-devel')
#optdepends=('guile: for use with Guile bindings')
source=(https://gnupg.org/ftp/gcrypt/gnutls/v${_base_ver%.*}/${pkgname}-${pkgver}.tar.xz{,.sig}
gnutls-3.6.3-msysize.patch)
gnulib-weak.patch)
sha256sums=('646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752'
'SKIP'
'ede10b896e2cf8da72127fa7813fca15ba46f418167ecea6faef016744cf1ed2')
'610499234d0442a27d048dab0dd233111d78f67c928979e40a02b6ac223bfbbf')
validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F' # "Simon Josefsson <simon@josefsson.org>"
'1F42418905D8206AA754CCDC29EE58B996865171' # "Nikos Mavrogiannopoulos <nmav@gnutls.org>
'462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
prepare() {
cd "${srcdir}"/${pkgname}-${_base_ver}
patch -p1 -i ${srcdir}/gnutls-3.6.3-msysize.patch
patch -p1 -i ${srcdir}/gnulib-weak.patch
autoreconf -vfi
}
build() {
cd "${srcdir}/${pkgname}-${_base_ver}"
CHOST="${CHOST/-msys/-cygwin}" \
./configure \
--build=${CHOST} \
--prefix=/usr \
@@ -73,7 +75,6 @@ package_gnutls() {
package_libgnutls() {
depends=('gcc-libs' 'libidn2' 'libiconv' 'libintl' 'gmp' 'libnettle' 'libp11-kit' 'libtasn1' 'zlib')
groups=('libraries')
install=libgnutls.install
mkdir -p ${pkgdir}/usr/bin
cp -f ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/

12
gnutls/gnulib-weak.patch Normal file
View File

@@ -0,0 +1,12 @@
--- a/m4/threadlib.m4
+++ b/m4/threadlib.m4
@@ -101,6 +101,9 @@
#pragma weak fputs
int main ()
{
+#ifdef __CYGWIN__
+ return 1;
+#endif
return (fputs == NULL);
}]])],
[gl_cv_have_weak=yes],

171
gnutls/gnutls-3.6.3-msysize.patch
View File

@@ -1,171 +0,0 @@
diff -Naur gnutls-3.6.3-orig/build-aux/ar-lib gnutls-3.6.3/build-aux/ar-lib
--- gnutls-3.6.3-orig/build-aux/ar-lib 2018-07-13 08:14:46.000000000 +0300
+++ gnutls-3.6.3/build-aux/ar-lib 2018-07-26 13:56:44.494565900 +0300
@@ -56,6 +56,9 @@
CYGWIN* | MSYS*)
file_conv=cygwin
;;
+ MSYS*)
+ file_conv=cygwin
+ ;;
*)
file_conv=wine
;;
@@ -68,6 +71,9 @@
cygwin | msys)
file=`cygpath -m "$file" || echo "$file"`
;;
+ msys)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
wine)
file=`winepath -w "$file" || echo "$file"`
;;
diff -Naur gnutls-3.6.3-orig/build-aux/config.guess gnutls-3.6.3/build-aux/config.guess
--- gnutls-3.6.3-orig/build-aux/config.guess 2018-06-16 16:27:19.000000000 +0300
+++ gnutls-3.6.3/build-aux/config.guess 2018-07-26 13:57:41.060265300 +0300
@@ -917,6 +917,9 @@
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-pc-cygwin
exit ;;
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
+ echo x86_64-unknown-msys
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')"
exit ;;
diff -Naur gnutls-3.6.3-orig/build-aux/config.rpath gnutls-3.6.3/build-aux/config.rpath
--- gnutls-3.6.3-orig/build-aux/config.rpath 2018-07-13 08:13:41.000000000 +0300
+++ gnutls-3.6.3/build-aux/config.rpath 2018-07-26 13:58:24.927542300 +0300
@@ -57,7 +57,7 @@
aix*)
wl='-Wl,'
;;
- mingw* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
@@ -149,7 +149,7 @@
hardcode_minus_L=no
case "$host_os" in
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
@@ -198,7 +198,7 @@
ld_shlibs=no
fi
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -348,7 +348,7 @@
;;
bsdi[45]*)
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -533,7 +533,7 @@
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
- cygwin* | mingw* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -Naur gnutls-3.6.3-orig/m4/dup2.m4 gnutls-3.6.3/m4/dup2.m4
--- gnutls-3.7.0/m4/dup2.m4.orig 2020-12-09 23:35:38.804994300 +0100
+++ gnutls-3.7.0/m4/dup2.m4 2020-12-09 23:36:31.302546400 +0100
@@ -69,7 +69,7 @@
[case "$host_os" in
mingw*) # on this platform, dup2 always returns 0 for success
gl_cv_func_dup2_works="guessing no" ;;
- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0
gl_cv_func_dup2_works="guessing no" ;;
aix* | freebsd*)
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
diff -Naur gnutls-3.6.3-orig/m4/fcntl.m4 gnutls-3.6.3/m4/fcntl.m4
--- gnutls-3.6.3-orig/m4/fcntl.m4 2018-07-13 08:13:42.000000000 +0300
+++ gnutls-3.6.3/m4/fcntl.m4 2018-07-26 13:59:23.474445200 +0300
@@ -70,7 +70,7 @@
[gl_cv_func_fcntl_f_dupfd_works=yes],
[gl_cv_func_fcntl_f_dupfd_works=no],
[case $host_os in
- aix* | cygwin* | haiku*)
+ aix* | cygwin* | msys* | haiku*)
gl_cv_func_fcntl_f_dupfd_works="guessing no" ;;
*) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;;
esac])])
diff -Naur gnutls-3.6.3-orig/m4/getcwd.m4 gnutls-3.6.3/m4/getcwd.m4
--- gnutls-3.6.3-orig/src/gl/m4/getcwd.m4 2018-07-13 08:13:42.000000000 +0300
+++ gnutls-3.6.3/src/gl/m4/getcwd.m4 2018-07-26 13:59:50.899293300 +0300
@@ -54,7 +54,7 @@
# Guess yes on musl systems.
*-musl*) gl_cv_func_getcwd_null="guessing yes";;
# Guess yes on Cygwin.
- cygwin*) gl_cv_func_getcwd_null="guessing yes";;
+ cygwin*|msys*) gl_cv_func_getcwd_null="guessing yes";;
# If we don't know, obey --enable-cross-guesses.
*) gl_cv_func_getcwd_null="$gl_cross_guess_normal";;
esac
diff -Naur gnutls-3.6.3-orig/m4/getdtablesize.m4 gnutls-3.6.3/m4/getdtablesize.m4
--- gnutls-3.6.3-orig/m4/getdtablesize.m4 2018-07-13 08:13:42.000000000 +0300
+++ gnutls-3.6.3/m4/getdtablesize.m4 2018-07-26 14:00:10.149727100 +0300
@@ -42,7 +42,7 @@
[gl_cv_func_getdtablesize_works=yes],
[gl_cv_func_getdtablesize_works=no],
[case "$host_os" in
- cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
+ cygwin* | msys*) # on cygwin 1.5.25, getdtablesize() automatically grows
gl_cv_func_getdtablesize_works="guessing no" ;;
*) gl_cv_func_getdtablesize_works="guessing yes" ;;
esac
diff -Naur gnutls-3.6.3-orig/m4/printf.m4 gnutls-3.6.3/m4/printf.m4
--- gnutls-3.6.3-orig/m4/printf.m4 2018-07-13 08:13:42.000000000 +0300
+++ gnutls-3.6.3/m4/printf.m4 2018-07-26 14:01:04.375422400 +0300
@@ -817,6 +817,7 @@
irix*) gl_cv_func_printf_directive_ls="guessing no";;
solaris*) gl_cv_func_printf_directive_ls="guessing no";;
cygwin*) gl_cv_func_printf_directive_ls="guessing no";;
+ msys*) gl_cv_func_printf_directive_ls="guessing no";;
beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";;
# Guess no on Android.
linux*-android*) gl_cv_func_printf_directive_ls="guessing no";;
@@ -901,6 +902,7 @@
changequote(,)dnl
case "$host_os" in
cygwin*) gl_cv_func_printf_flag_grouping="guessing no";;
+ msys*) gl_cv_func_printf_flag_grouping="guessing no";;
netbsd*) gl_cv_func_printf_flag_grouping="guessing no";;
# Guess no on Android.
linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";;
@@ -1614,6 +1616,7 @@
darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on Cygwin.
cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+ msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
# Guess yes on Solaris >= 2.6.
solaris2.[0-5] | solaris2.[0-5].*)
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
diff -Naur gnutls-3.6.3-orig/m4/threadlib.m4 gnutls-3.6.3/m4/threadlib.m4
--- gnutls-3.6.3-orig/m4/threadlib.m4 2018-07-13 08:13:42.000000000 +0300
+++ gnutls-3.6.3/m4/threadlib.m4 2018-07-26 14:01:49.554101800 +0300
@@ -413,7 +413,7 @@
dnl Disable multithreading by default on Cygwin 1.5.x, because it has
dnl bugs that lead to endless loops or crashes. See
dnl <https://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
- cygwin*)
+ cygwin* | msys*)
case `uname -r` in
1.[0-5].*) gl_use_threads=no ;;
*) gl_use_threads=yes ;;

20
gnutls/libgnutls.install
View File

@@ -1,20 +0,0 @@
infodir=usr/share/info
filelist="gnutls.info-1 gnutls.info-2 gnutls.info-3 gnutls.info-4 gnutls.info-5 gnutls.info-6 gnutls.info gnutls-guile.info"
post_install() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info $infodir/${file}.gz $infodir/dir 2> /dev/null
done
}
post_upgrade() {
post_install $1
}
pre_remove() {
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info --delete $infodir/${file}.gz $infodir/dir 2> /dev/null
done
}