cdparanoia: use common cached autoconf value

- ac_cv_sizeof_long is 4 in ppc
- fix configure script to initialise ac_cv_objext before try-compile
This commit is contained in:
Đoàn Trần Công Danh 2020-02-28 10:46:22 +07:00 committed by Juan RP
parent 27ec3c604e
commit aacdf50877
3 changed files with 42 additions and 27 deletions

View file

@ -0,0 +1,17 @@
AC_PROG_CC will initialise a lot of value which is used by
- AC_HEADER_STDC; and
- AC_CHECK_SIZEOF
---
--- configure.in
+++ configure.in
@@ -5,9 +5,7 @@ cp $srcdir/configure.sub $srcdir/config.sub
AC_CANONICAL_HOST
-if test -z "$CC"; then
- AC_PROG_CC
-fi
+AC_PROG_CC
AC_PROG_RANLIB
AC_CHECK_PROG(AR,ar,ar)
AC_CHECK_PROG(INSTALL,install,install)

View file

@ -0,0 +1,17 @@
--- Makefile.in
+++ Makefile.in
@@ -19,10 +19,10 @@ RANLIB=@RANLIB@
INSTALL=@INSTALL@
prefix=@prefix@
exec_prefix=@exec_prefix@
-BINDIR=@bindir@
-MANDIR=@mandir@
-INCLUDEDIR=@includedir@
-LIBDIR=@libdir@
+BINDIR=$(DESTDIR)@bindir@
+MANDIR=$(DESTDIR)@mandir@
+INCLUDEDIR=$(DESTDIR)@includedir@
+LIBDIR=$(DESTDIR)@libdir@
PWD = $(shell pwd)
OFILES = main.o report.o header.o buffering_write.o cachetest.o

View file

@ -1,48 +1,28 @@
# Template file for 'cdparanoia'.
# Template file for 'cdparanoia'
pkgname=cdparanoia
version=10.2
revision=13
revision=14
wrksrc="${pkgname}-III-${version}"
hostmakedepends="libtool automake"
build_style=gnu-configure
hostmakedepends="libtool automake"
short_desc="CDDA reading utility with extra data verification features"
homepage="https://www.xiph.org/paranoia/"
license="GPL-2"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.xiph.org/paranoia/"
distfiles="http://downloads.xiph.org/releases/$pkgname/$pkgname-III-$version.src.tgz"
checksum=005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
CFLAGS="-Du_int16_t=uint16_t -Du_int32_t=uint32_t"
disable_parallel_build=yes
if [ -n "$CROSS_BUILD" ]; then
configure_args+=" ac_cv_have_stdint_h=yes"
configure_args+=" ac_cv_type_short=yes ac_cv_sizeof_short=2"
configure_args+=" ac_cv_type_int=yes ac_cv_sizeof_int=4"
configure_args+=" ac_cv_type_long=yes"
configure_args+=" ac_cv_type_long_long=yes ac_cv_sizeof_long_long=8"
configure_args+=" ac_cv_type_int16_t=yes ac_cv_sizeof_int16_t=2"
configure_args+=" ac_cv_type_int32_t=yes ac_cv_sizeof_int32_t=4"
case "$XBPS_TARGET_MACHINE" in
arm*|mips*|i686*) # 32 bit architectures
configure_args+=" ac_cv_sizeof_long=4"
;;
*)
configure_args+=" ac_cv_sizeof_long=8"
;;
esac
fi
pre_configure() {
autoreconf -i
}
do_install() {
make prefix=${DESTDIR}/usr BINDIR=${DESTDIR}/usr/bin MANDIR=${DESTDIR}/usr/share/man LIBDIR=${DESTDIR}/usr/lib install
autoreconf -fi
}
libcdparanoia_package() {
replaces="${sourcepkg}<10.2_10"
short_desc+=" - runtime library"
license="LGPL-2.1-only"
pkg_install() {
vmove usr/lib/*.so.*
}
@ -51,6 +31,7 @@ libcdparanoia-devel_package() {
replaces="${sourcepkg}-devel<10.2_10"
depends="lib${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
license="LGPL-2.1-only"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"