[PR PATCH] [RFC] geda: remove -32bit makedepends

[PR PATCH] [RFC] geda: remove -32bit makedepends

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

There is a new pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages geda_32bit
https://github.com/void-linux/void-packages/pull/13005

[RFC] geda: remove -32bit makedepends
@pullmoll This doesn't actually seem necessary to build it. This is related to the discussion at #12982 and #12990.

A patch file from https://github.com/void-linux/void-packages/pull/13005.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geda_32bit-13005.patch --]
[-- Type: application/text/x-diff, Size: 1114 bytes --]

From bbe799674c38b3178d37348a3dbd69d12e97674d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 11 Jul 2019 19:47:06 -0500
Subject: [PATCH] geda: remove -32bit makedepends

---
 srcpkgs/geda/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template
index 23d895d1381..5cce2d5e8b7 100644
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@@ -1,7 +1,7 @@
 # Template file for 'geda'
 pkgname=geda
 version=1.8.2
-revision=7
+revision=8
 wrksrc="${pkgname}-gaf-${version}"
 build_style=gnu-configure
 configure_args="--with-sysroot=/${XBPS_CROSS_BASE}"
@@ -16,10 +16,6 @@ homepage="http://www.geda-project.org/"
 distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
 checksum=bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721
 
-if [ "${XBPS_ARCH}" = "x86_64" ]; then
-	hostmakedepends+=" glibc-devel-32bit"
-fi
-
 geda-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

Re: [RFC] geda: remove -32bit makedepends

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/13005#issuecomment-510707783
Comment:
But it also seems that cross-compile is broken now anyway.

Re: [RFC] geda: remove -32bit makedepends

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 649 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/13005#issuecomment-510798531
Comment:
The dependency was used to ensure the `#include <gnu/stubs32.h>` which is included from `shell.c` generated by `guile-snarf` from `shell.x` is available.
I'm working on a fix for cross compiling. Perhaps due to `guile` or due to me regenerating the configure script (`hostmakedepends+=" automake gettext-devel libtool"` and running `./autogen.sh`) we now also need `makedepends+=" libatomic_ops-devel"`.

Still, without `glibc-devel-32bit` the `<gnu/stubs32.h>` is not found and compiling `shell.c` fails.

Re: [RFC] geda: remove -32bit makedepends

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 1373 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/13005#issuecomment-510799856
Comment:
This is the output of the failing build:
```
make[3]: Entering directory '/builddir/geda-gaf-1.8.2/libgeda/shell'
CPP="aarch64-linux-gnu-cpp" guile-snarf -o shell.x shell.c -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H -I. -I../..   -I./../include -I../.. -I/usr/include -I../../intl  -Wall   -pthread -I/usr/aarch64-linux-gnu/usr/include/guile/2.0 -I/usr/aarch64-linux-gnu/usr/include/glib-2.0 -I/usr/aarch64-linux-gnu/usr/lib/glib-2.0/include -pthread -I/usr/aarch64-linux-gnu/usr/include/gdk-pixbuf-2.0 -I/usr/aarch64-linux-gnu/usr/include/libmount -I/usr/aarch64-linux-gnu/usr/include/blkid -I/usr/aarch64-linux-gnu/usr/include/glib-2.0 -I/usr/aarch64-linux-gnu/usr/lib/glib-2.0/include
In file included from /usr/include/features.h:474,
                 from /usr/include/unistd.h:25,
                 from shell.c:28:
/usr/include/gnu/stubs.h:7:11: fatal error: gnu/stubs-32.h: No such file or directory
    7 | # include <gnu/stubs-32.h>
      |           ^~~~~~~~~~~~~~~~
compilation terminated.
```
Note the most probably wrong `-I/usr/include` in the `CPPFLAGS` passed to `guile-snarf` for a cross compile.
Perhaps we need a build wrapper for `guile-snarf` to replace `/usr` with `${XBPS_CROSS_BASE}/usr`.

Re: [RFC] geda: remove -32bit makedepends

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/13005#issuecomment-510921020
Comment:
I can't find that error in either Travis or when I build it myself?

Re: [RFC] geda: remove -32bit makedepends

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 1859 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/13005#issuecomment-510991997
Comment:
It's an output of my modified template:
```
# Template file for 'geda'
pkgname=geda
version=1.8.2
revision=7
wrksrc="${pkgname}-gaf-${version}"
build_style=gnu-configure
hostmakedepends="automake desktop-file-utils gettext-devel guile
libtool pkg-config shared-mime-info"
makedepends="gc-devel gtk+-devel guile-devel libatomic_ops-devel"
depends="guile geda-data"
checkdepends="perl"
short_desc="Electronic Design Automation tool"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
homepage="http://www.geda-project.org/"
distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}/geda-gaf-${version}.tar.gz"
checksum=bbf4773aef1b5a51a8d6f4c3fa288c047340cc62dd6e14d7928fcc6e4051b721

pre_configure() {
        vsed -i libgeda/shell/Makefile.am -e "s;\$(snarf_cpp_opts);\$(subst I/usr/include,I${XBPS_CROSS_BASE
}/usr/include,\$(snarf_cpp_opts));"
        NOCONFIGURE=1 ./autogen.sh
}

geda-devel_package() {
        depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
        short_desc+=" - development files"
        pkg_install() {
                vmove "usr/lib/*.so"
                vmove usr/lib/pkgconfig
                vmove usr/include
        }
}
geda-doc_package() {
        archs=noarch
        depends="${sourcepkg}>=${version}_${revision}"
        short_desc+=" - documentation and exmaple files"
        pkg_install() {
                vmove usr/share/doc
        }
}
geda-data_package() {
        archs=noarch
        short_desc+=" - data files"
        pkg_install() {
                vmove usr/share/gEDA
        }
}
```
I can't find the `create new gist` link and am lazy, sorry.

Re: [RFC] geda: remove -32bit makedepends

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/13005#issuecomment-541447124

Comment:
This is solved for now with the update by creating a dummy `${wrksrc}/gnu/stubs-32.h` empty file.

Re: [PR PATCH] [Closed]: [RFC] geda: remove -32bit makedepends

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

There's a closed pull request on the void-packages repository

[RFC] geda: remove -32bit makedepends
https://github.com/void-linux/void-packages/pull/13005

Description:
@pullmoll This doesn't actually seem necessary to build it. This is related to the discussion at #12982 and #12990.