vice: export ar_check="no" instead of patching to avoid usage of ar wrapper

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2019-08-21 21:56:28 +02:00
parent 9f0e801b3f
commit 4876f737e7
2 changed files with 2 additions and 51 deletions

View File

@@ -1,50 +0,0 @@
From e65294ee2a7890e7a224db38a98ea20ccc412391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 21 Aug 2019 01:26:42 +0200
Subject: [PATCH] Do not check if ar suppurts '-u' option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
wrap-u-ar.sh does not semm necessary and it does notwork for us in first place
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3d51636..c36fc5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1238,25 +1238,6 @@ if test x"$ar_check" != "xno"; then
fi
fi
-dnl check if ar needs a wrapper to get rid of the 'u' option
-if test x"$ar_check" != "xno"; then
- AC_MSG_CHECKING(if ar complains about the 'u' option)
- rm -f vicetest.c
- touch vicetest.c
- $CC -c vicetest.c -o vicetest.o
- rm -f vicetest.c
- rm -f libvicetest.a
- complains=`$AR cru libvicetest.a vicetest.o 2>&1`
- if test x"$complains" != "x"; then
- AC_MSG_RESULT(yes)
- echo "using ar wrapper instead of ar directly"
- AR_WRAP="$AR"
- AR="\$(top_srcdir)/src/wrap-u-ar.sh \"$AR_WRAP\""
- else
- AC_MSG_RESULT(no)
- fi
-fi
-
AC_CHECK_PROGS(MAKEINFO, makeinfo, no)
AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no)
--
2.21.0

View File

@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
file://0001-fix-autoreconfig.patch \
file://0002-Do-not-check-if-ar-suppurts-u-option.patch \
file://c64_16.png \
file://c64_32.png \
file://c64_48.png \
@@ -54,6 +53,8 @@ EXTRA_OECONF = " \
--libdir=${libdir} \
"
export ar_check="no"
do_install_append() {
install -d ${D}/${datadir}/applications
install -m 0644 ${WORKDIR}/vice_64.desktop ${D}/${datadir}/applications