guile1.8: remove
This commit is contained in:
newbluemoon
Echo
parent
f97d3928d3
commit
d5e86db785
7 changed files with 2 additions and 128 deletions
|
|
@ -3107,12 +3107,6 @@ libprotoc.so.31 libprotoc-3.20.1_1
|
|||
libprotobuf.so.31 libprotobuf-3.20.1_1
|
||||
libsombok.so.3 sombok-2.4.0_1
|
||||
libdeviceclient.so.0 pragha-1.3.3_1
|
||||
libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
|
||||
libguile-srfi-srfi-4-v-3.so.3 guile1.8-1.8.8_1
|
||||
libguile-srfi-srfi-60-v-2.so.2 guile1.8-1.8.8_1
|
||||
libguile.so.17 guile1.8-1.8.8_1
|
||||
libguilereadline-v-17.so.17 guile1.8-1.8.8_1
|
||||
libguile-srfi-srfi-13-14-v-3.so.3 guile1.8-1.8.8_1
|
||||
libykclient.so.3 ykclient-2.15_1
|
||||
libbooster.so.0 cppcms-1.0.5_1
|
||||
libcppcms.so.1 cppcms-1.0.5_1
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
guile1.8
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Configure cannot execute built binary when cross compiling.
|
||||
The patch skips the test and assumes "no".
|
||||
This is how it is done in version 2.0.14's configure script.
|
||||
|
||||
--- a/configure 2017-09-15 11:14:54.427295947 +0200
|
||||
+++ b/configure 2017-09-15 14:11:07.253528181 +0200
|
||||
@@ -19802,6 +19802,7 @@
|
||||
$as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; }
|
||||
old_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
|
||||
+if test "$cross_compiling" = no; then
|
||||
if test "$cross_compiling" = yes; then :
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
@@ -19849,6 +19850,10 @@
|
||||
conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
|
||||
+else
|
||||
+ works="assuming it doesn't"
|
||||
+fi
|
||||
+
|
||||
CFLAGS="$old_CFLAGS"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5
|
||||
$as_echo "$works" >&6; }
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- a/libguile/fports.c 2010-12-13 18:24:40.000000000 +0100
|
||||
+++ b/libguile/fports.c 2017-10-25 21:51:07.234942515 +0200
|
||||
@@ -78,8 +78,8 @@
|
||||
#define OFF_T_MAX LONG_MAX
|
||||
#define OFF_T_MIN LONG_MIN
|
||||
#elif SIZEOF_OFF_T == SIZEOF_LONG_LONG
|
||||
-#define OFF_T_MAX LONG_LONG_MAX
|
||||
-#define OFF_T_MIN LONG_LONG_MIN
|
||||
+#define OFF_T_MAX LLONG_MAX
|
||||
+#define OFF_T_MIN LLONG_MIN
|
||||
#else
|
||||
#error Oops, unknown OFF_T size
|
||||
#endif
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
When checking for the location of the sigcontext struct it is not taken into
|
||||
account that a different libc than glibc could be used. It falls back to libc5
|
||||
which leads to a sigcontext redefinition error when using the musl libc. The
|
||||
patch simply removes the misleading checks since we're way beyond those
|
||||
versions anyway.
|
||||
|
||||
--- a/libguile/gc_os_dep.c 2010-12-13 18:25:01.000000000 +0100
|
||||
+++ b/libguile/gc_os_dep.c 2017-09-17 23:01:55.494204333 +0200
|
||||
@@ -1445,40 +1445,6 @@
|
||||
/* include assembly code to do it well. */
|
||||
# endif
|
||||
|
||||
-# if defined(LINUX) && !defined(POWERPC)
|
||||
-
|
||||
-# if 0
|
||||
-# include <linux/version.h>
|
||||
-# if (LINUX_VERSION_CODE <= 0x10400)
|
||||
- /* Ugly hack to get struct sigcontext_struct definition. Required */
|
||||
- /* for some early 1.3.X releases. Will hopefully go away soon. */
|
||||
- /* in some later Linux releases, asm/sigcontext.h may have to */
|
||||
- /* be included instead. */
|
||||
-# define __KERNEL__
|
||||
-# include <asm/signal.h>
|
||||
-# undef __KERNEL__
|
||||
-# endif
|
||||
-
|
||||
-# else
|
||||
-
|
||||
- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
|
||||
- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */
|
||||
- /* prototypes, so we have to include the top-level sigcontext.h to */
|
||||
- /* make sure the former gets defined to be the latter if appropriate. */
|
||||
-# include <features.h>
|
||||
-# if 2 <= __GLIBC__
|
||||
-# if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__
|
||||
- /* glibc 2.1 no longer has sigcontext.h. But signal.h */
|
||||
- /* has the right declaration for glibc 2.1. */
|
||||
-# include <sigcontext.h>
|
||||
-# endif /* 0 == __GLIBC_MINOR__ */
|
||||
-# else /* not 2 <= __GLIBC__ */
|
||||
- /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */
|
||||
- /* one. Check LINUX_VERSION_CODE to see which we should reference. */
|
||||
-# include <asm/sigcontext.h>
|
||||
-# endif /* 2 <= __GLIBC__ */
|
||||
-# endif
|
||||
-# endif
|
||||
# if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS)
|
||||
# include <sys/types.h>
|
||||
# if !defined(MSWIN32) && !defined(SUNOS4)
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
# Template file for 'guile1.8'
|
||||
pkgname=guile1.8
|
||||
version=1.8.8
|
||||
revision=3
|
||||
wrksrc=${pkgname/1.8/}-${version}
|
||||
build_style="gnu-configure"
|
||||
configure_args="--disable-static --disable-error-on-warning --program-suffix='-1.8'"
|
||||
make_build_args="GUILE_FOR_BUILD=guile"
|
||||
hostmakedepends="pkg-config guile"
|
||||
makedepends="gmp-devel libltdl-devel ncurses-devel readline-devel"
|
||||
short_desc="Portable, embeddable Scheme implementation written in C"
|
||||
maintainer="newbluemoon <blaumolch@mailbox.org>"
|
||||
license="LGPL-2.1-or-later"
|
||||
homepage="https://www.gnu.org/software/guile/guile.html"
|
||||
distfiles="${GNU_SITE}/${pkgname/1.8/}/${pkgname/1.8/}-${version}.tar.gz"
|
||||
checksum=c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050
|
||||
|
||||
post_install() {
|
||||
# conflicts with guile-2.0
|
||||
rm -rf ${DESTDIR}/usr/share/info
|
||||
}
|
||||
|
||||
guile1.8-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="gmp-devel ${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/bin/guile-config-1.8
|
||||
sed -i '1s|/usr/bin/guile|/usr/bin/guile-1.8|' ${PKGDESTDIR}/usr/bin/guile-config-1.8
|
||||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/share/aclocal
|
||||
mv ${PKGDESTDIR}/usr/share/aclocal/{guile.m4,guile-1.8.m4}
|
||||
}
|
||||
}
|
||||
|
|
@ -106,6 +106,8 @@ replaces="
|
|||
gst1-python<=1.18.3_1
|
||||
gtkhtml-devel<=4.10.0_1
|
||||
gtkhtml<=4.10.0_1
|
||||
guile1.8-devel<=1.8.8_3
|
||||
guile1.8<=1.8.8_3
|
||||
gx-go<=1.9.0_1
|
||||
httperf<=0.9.0_9
|
||||
icecat-i18n-ach<=78.6.1_1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue