CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdparanoia: Fix autoconf do it builds on new arches like aarch64

Browse Source 
Also build out of tree builds while here

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2017-04-07 00:08:56 +00:00 committed by Martin Jansa
parent 71feffbdfd
commit 47604c0409
3 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb
View File

@ -11,6 +11,8 @@ SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${PV}.sr
file://0001-Use-DESTDIR-in-install-Makefile-rule.patch \
file://0002-interface-remove-C-reserved-keyword.patch \
file://0003-Fix-missing-shared-object-LDFLAGS.patch \
file://dont-use-internal-configs.patch \
file://out-of-tree-build.patch \
"
SRC_URI[md5sum] = "b304bbe8ab63373924a744eac9ebc652"
SRC_URI[sha256sum] = "005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df"
@ -24,4 +26,6 @@ S = "${WORKDIR}/cdparanoia-III-${PV}"
# between the compilation of those two targets)
PARALLEL_MAKE = ""
inherit autotools-brokensep
EXTRA_OECONF = "CC='${CC}' CFLAGS='${CFLAGS}'"
inherit autotools

30
meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch Normal file
View File

@ -0,0 +1,30 @@
Index: cdparanoia-III-10.2/configure.in
===================================================================
--- cdparanoia-III-10.2.orig/configure.in
+++ cdparanoia-III-10.2/configure.in
@@ -1,13 +1,8 @@
AC_INIT(interface/interface.c)
-cp $srcdir/configure.guess $srcdir/config.guess
-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)
@@ -44,8 +39,8 @@ case 4 in
$ac_cv_sizeof_long) SIZE32="long";;
esac
-AC_CHECK_TYPE(int16_t,SIZE16="int16_t",,)
-AC_CHECK_TYPE(int32_t,SIZE32="size32_t",,)
+AC_CHECK_TYPES([int16_t], [SIZE16="int16_t"], [], [[#include <stdint.h>]])
+AC_CHECK_TYPES([int32_t], [SIZE32="int32_t"], [], [[#include <stdint.h>]])
if test -z "$SIZE16"; then
AC_MSG_ERROR(No 16 bit type found on this platform!)

42
meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch Normal file
View File

@ -0,0 +1,42 @@
Index: cdparanoia-III-10.2/Makefile.in
===================================================================
--- cdparanoia-III-10.2.orig/Makefile.in
+++ cdparanoia-III-10.2/Makefile.in
@@ -6,6 +6,8 @@
VERSION=10.2
VPATH=@srcdir@
srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+top_builddir=@top_builddir@
@SET_MAKE@
FLAGS=@TYPESIZES@ @CFLAGS@
@@ -64,19 +66,19 @@ slib:
install:
$(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(top_builddir)/cdparanoia $(DESTDIR)$(BINDIR)
$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)
$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1
- $(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL) -m 0644 $(top_srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
$(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR)
- $(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL) -m 0644 $(top_srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
- $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
- $(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
- $(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
- $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
- $(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
- $(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL) -m 0644 $(top_builddir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(top_builddir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(top_srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL) -m 0644 $(top_builddir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(top_builddir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 0644 $(top_srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
ln -fs libcdda_interface.so.0.$(VERSION) \
$(DESTDIR)$(LIBDIR)/libcdda_interface.so.0
ln -fs libcdda_interface.so.0.$(VERSION) \