Attachment 913657 Details for Bug 926341 – Run autoreconf to fix FTBFS on aarch64

[patch] Run autoreconf to fix FTBFS on aarch64

Run-autoreconf-to-fix-FTBFS-on-aarch64-926341.patch (text/plain), 11.38 KB, created by Yaakov Selkowitz on 2014-07-01 06:14:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-07-01 06:14:22 UTC

Size: 11.38 KB

patch

obsolete

>From eeab5e2fcf3e4a6ed69ba19d7245c5bc2a2df477 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Tue, 1 Jul 2014 01:12:24 -0500
>Subject: [PATCH] Run autoreconf to fix FTBFS on aarch64 (#926341)
>
>---
> pinball-0.3.1-lacomment.patch |  32 +++++----
> pinball-0.3.1-sys-ltdl.patch  | 146 +++---------------------------------------
> pinball.spec                  |  17 +++--
> 3 files changed, 31 insertions(+), 164 deletions(-)
>
>diff --git a/pinball-0.3.1-lacomment.patch b/pinball-0.3.1-lacomment.patch
>index 60a93bc..0c99f7d 100644
>--- a/pinball-0.3.1-lacomment.patch
>+++ b/pinball-0.3.1-lacomment.patch
>@@ -1,22 +1,20 @@
>---- src/Makefile.in~	2010-11-15 10:55:51.000000000 -0600
>-+++ src/Makefile.in	2010-11-15 11:07:27.427255000 -0600
>-@@ -505,7 +505,7 @@
>- 	uninstall-pinincludeHEADERS uninstall-pinlibLIBRARIES
>- 
>+--- a/src/Makefile.am
>++++ b/src/Makefile.am
>+@@ -29,7 +29,6 @@ Script.cpp \
>+ StateBehavior.cpp \
>+ Table.cpp
>  
> -dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
>-+#dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES)
>  
>- # !+rzr : This trick workaround a bad generated rule (under Linux mingw32)
>- # src/ litool returns:  -L/usr/local//lib /usr/lib/libjpeg.so
>---- test/Makefile.in~	2010-11-15 11:11:07.000000000 -0600
>-+++ test/Makefile.in	2010-11-15 11:12:46.119254852 -0600
>-@@ -621,7 +621,7 @@
>- 	mostlyclean-generic mostlyclean-libtool tags uninstall \
>- 	uninstall-am uninstall-info-am uninstall-testlibLTLIBRARIES
>+ pininclude_HEADERS = \
>+ ArmBehavior.h \
>+--- a/test/Makefile.am
>++++ b/test/Makefile.am
>+@@ -4,7 +4,6 @@ testlibdir = $(EM_LIBDIR)
>+ testdatadir = $(pkgdatadir)
>  
>+ noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
> -dnl noinst_PROGRAMS = unittest
>-+#dnl noinst_PROGRAMS = unittest
>- # Tell versions [3.59,3.63) of GNU make to not export all variables.
>- # Otherwise a system limit (for SysV at least) may be exceeded.
>- .NOEXPORT:
>+ 
>+ INCLUDES = -I../base -I../addon -I../src @INCLTDL@
>+ LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
>diff --git a/pinball-0.3.1-sys-ltdl.patch b/pinball-0.3.1-sys-ltdl.patch
>index 19ecad5..381ad44 100644
>--- a/pinball-0.3.1-sys-ltdl.patch
>+++ b/pinball-0.3.1-sys-ltdl.patch
>@@ -1,55 +1,6 @@
>---- pinball-0.3.1/Makefile.in~	2006-08-03 12:18:40.000000000 +0200
>-+++ pinball-0.3.1/Makefile.in	2006-08-03 12:18:40.000000000 +0200
>-@@ -107,7 +107,7 @@
>- install_sh = @install_sh@
>- AUTOMAKE_OPTIONS = gnu
>- 
>--SUBDIRS = libltdl addon base data src test
>-+SUBDIRS = addon base data src test
>- 
>- EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
>- 
>---- pinball-0.3.1/src/Makefile.in~	2006-08-03 12:20:12.000000000 +0200
>-+++ pinball-0.3.1/src/Makefile.in	2006-08-03 12:20:12.000000000 +0200
>-@@ -114,9 +114,9 @@
>- 
>- pinlib_LIBRARIES = libemilia_pin.a
>- 
>--INCLUDES = -I../base -I../addon @INCLTDL@
>-+INCLUDES = -I../base -I../addon
>- 
>--pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
>-+pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
>- pinball_LDFLAGS = -export-dynamic
>- 
>- pinball_SOURCES = Pinball.cpp
>---- pinball-0.3.1/src/Makefile.am~	2006-08-03 12:20:35.000000000 +0200
>-+++ pinball-0.3.1/src/Makefile.am	2006-08-03 12:20:35.000000000 +0200
>-@@ -7,9 +7,9 @@
>- 
>- pinlib_LIBRARIES = libemilia_pin.a
>- 
>--INCLUDES = -I../base -I../addon @INCLTDL@
>-+INCLUDES = -I../base -I../addon
>- 
>--pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
>-+pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
>- pinball_LDFLAGS = -export-dynamic
>- 
>- pinball_SOURCES = Pinball.cpp
>---- pinball-0.3.1/Makefile.am~	2006-08-03 12:18:12.000000000 +0200
>-+++ pinball-0.3.1/Makefile.am	2006-08-03 12:18:12.000000000 +0200
>-@@ -1,6 +1,6 @@
>- AUTOMAKE_OPTIONS = gnu
>- 
>--SUBDIRS = libltdl addon base data src test
>-+SUBDIRS = addon base data src test
>- 
>- EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
>- 
>---- pinball-0.3.1/configure.ac~	2006-08-03 12:17:50.000000000 +0200
>-+++ pinball-0.3.1/configure.ac	2006-08-03 12:17:50.000000000 +0200
>-@@ -14,19 +14,13 @@
>+--- a/configure.ac
>++++ b/configure.ac
>+@@ -14,8 +14,6 @@ AC_CANONICAL_TARGET
>  CFLAGS="-g -W -Wall -O2"
>  CXXFLAGS="-g -W -Wall -O2"
>  
>@@ -58,95 +9,14 @@
>  dnl Checks for programs.
>  AC_PROG_CC
>  AC_PROG_CXX
>- AC_PROG_INSTALL
>+@@ -23,9 +21,7 @@ AC_PROG_INSTALL
>  AC_LIBTOOL_DLOPEN
>--AC_LIBLTDL_CONVENIENCE
>+ AC_LIBLTDL_CONVENIENCE
>  AC_PROG_LIBTOOL
>- 
>+-
> -AC_SUBST(INCLTDL)
> -AC_SUBST(LIBLTDL)
>--
>++AC_WITH_LTDL
>+ 
>  dnl *******************************************
>  dnl PATHS AND DIRS ****************************
>- dnl data dirs, fuck I hate autoconf, spent 4 hours getting this right, had to 
>---- pinball-0.3.1/test/Makefile.in~	2006-08-03 12:21:11.000000000 +0200
>-+++ pinball-0.3.1/test/Makefile.in	2006-08-03 12:21:11.000000000 +0200
>-@@ -112,8 +112,8 @@
>- 
>- noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
>- 
>--INCLUDES = -I../base -I../addon -I../src @INCLTDL@
>--LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
>-+INCLUDES = -I../base -I../addon -I../src
>-+LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
>- 
>- testlib_LTLIBRARIES = libModuleTest.la
>- 
>---- pinball-0.3.1/test/Makefile.am~	2006-08-03 12:20:53.000000000 +0200
>-+++ pinball-0.3.1/test/Makefile.am	2006-08-03 12:20:53.000000000 +0200
>-@@ -6,8 +6,8 @@
>- noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
>- dnl noinst_PROGRAMS = unittest
>- 
>--INCLUDES = -I../base -I../addon -I../src @INCLTDL@
>--LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
>-+INCLUDES = -I../base -I../addon -I../src
>-+LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
>- 
>- testlib_LTLIBRARIES = libModuleTest.la
>- 
>---- pinball-0.3.1/configure~	2006-08-03 12:16:59.000000000 +0200
>-+++ pinball-0.3.1/configure	2006-08-03 12:16:59.000000000 +0200
>-@@ -431,7 +431,6 @@
>- PACKAGE_STRING='pinball 0.3.1'
>- PACKAGE_BUGREPORT='henqvist@users.sourceforge.net'
>- 
>--ac_subdirs_all="$ac_subdirs_all libltdl"
>- # Factoring default headers for most tests.
>- ac_includes_default="\
>- #include <stdio.h>
>-@@ -469,7 +468,7 @@
>- # include <unistd.h>
>- #endif"
>- 
>--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE subdirs CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL INCLTDL LIBLTDL EM_DATADIR EM_LIBDIR EM_BUILD_ROOT EM_HIGHSCORE_DIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS MATHLIB GL_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS ALLEGRO_CONFIG ALLEGRO_CFLAGS ALLEGRO_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS LIBOBJS LTLIBOBJS'
>-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE subdirs CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL EM_DATADIR EM_LIBDIR EM_BUILD_ROOT EM_HIGHSCORE_DIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS MATHLIB GL_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS ALLEGRO_CONFIG ALLEGRO_CFLAGS ALLEGRO_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS LIBOBJS LTLIBOBJS'
>- ac_subst_files=''
>- 
>- # Initialize some variables set by options.
>-@@ -1959,7 +1958,6 @@
>- 
>- 
>- 
>--subdirs="$subdirs libltdl"
>- 
>- 
>- ac_ext=c
>-@@ -3439,18 +3437,6 @@
>- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
>- 
>- 
>--  case $enable_ltdl_convenience in
>--  no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
>--echo "$as_me: error: this package needs a convenience libltdl" >&2;}
>--   { (exit 1); exit 1; }; } ;;
>--  "") enable_ltdl_convenience=yes
>--      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
>--  esac
>--  LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
>--  LTDLINCL='-I${top_srcdir}/''libltdl'
>--  # For backwards non-gettext consistent compatibility...
>--  INCLTDL="$LTDLINCL"
>--
>- # Check whether --enable-shared or --disable-shared was given.
>- if test "${enable_shared+set}" = set; then
>-   enableval="$enable_shared"
>-@@ -11788,8 +11774,6 @@
>- s,@CPP@,$CPP,;t t
>- s,@EGREP@,$EGREP,;t t
>- s,@LIBTOOL@,$LIBTOOL,;t t
>--s,@INCLTDL@,$INCLTDL,;t t
>--s,@LIBLTDL@,$LIBLTDL,;t t
>- s,@EM_DATADIR@,$EM_DATADIR,;t t
>- s,@EM_LIBDIR@,$EM_LIBDIR,;t t
>- s,@EM_BUILD_ROOT@,$EM_BUILD_ROOT,;t t
>diff --git a/pinball.spec b/pinball.spec
>index 353ef1f..0a0a918 100644
>--- a/pinball.spec
>+++ b/pinball.spec
>@@ -1,6 +1,6 @@
> Name:           pinball
> Version:        0.3.1
>-Release:        23%{?dist}
>+Release:        24%{?dist}
> Summary:        Emilia arcade game
> Group:          Amusements/Games
> License:        GPL+
>@@ -17,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:  libXt-devel freeglut-devel SDL_image-devel SDL_mixer-devel
> BuildRequires:  libpng-devel libvorbis-devel libtool-ltdl-devel
> BuildRequires:  desktop-file-utils
>+BuildRequires:  autoconf automake libtool
> Requires:       hicolor-icon-theme opengl-games-utils
> 
> %description
>@@ -30,20 +31,15 @@ There is only one level to play with but it is however very addictive.
> %patch0 -p1 -z .sys-ltdl
> %patch1 -p1 -z .hiscore
> %patch2 -p0
>-%patch3 -p0
>+%patch3 -p1
> %patch4 -p0
>-rm -fr libltdl
>-# sigh stop autoxxx from rerunning because of our patches above.
>-touch aclocal.m4
>-touch configure
>-touch `find -name Makefile.in`
>-touch pinconfig.h.in
>+autoreconf -fiv
> # cleanup a bit
> chmod -x ChangeLog */*.h */*.cpp data/*/Module*.cpp
> 
> 
> %build
>-%configure
>+%configure --without-included-ltdl
> make CXXFLAGS="$RPM_OPT_FLAGS"
> 
> 
>@@ -99,6 +95,9 @@ fi
> 
> 
> %changelog
>+* Tue Jul 01 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 0.3.1-24
>+- Run autoreconf to fix FTBFS on aarch64 (#926341)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-23
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 926341: 913657