From df33e1b23e599b5bae869ec04e6e8019c3f51dfe9a5c894ec6f4f4e3c5092317 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 12 May 2013 14:37:11 +0000 Subject: [PATCH] Accepting request 174789 from devel:ARM:AArch64:Factory - libgcroots-aarch64.patch: Add support for aarch64 in libgcroots - Don't regenerate configure OBS-URL: https://build.opensuse.org/request/show/174789 OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=41 --- libgcroots-aarch64.patch | 69 ++++++++++++++++++++++++++++++++++ uim-sigscheme-build-fixes.diff | 24 ------------ uim.changes | 6 +++ uim.spec | 9 +---- 4 files changed, 77 insertions(+), 31 deletions(-) create mode 100644 libgcroots-aarch64.patch delete mode 100644 uim-sigscheme-build-fixes.diff diff --git a/libgcroots-aarch64.patch b/libgcroots-aarch64.patch new file mode 100644 index 0000000..9fdc8f5 --- /dev/null +++ b/libgcroots-aarch64.patch @@ -0,0 +1,69 @@ +Index: uim-1.8.1/sigscheme/libgcroots/include/private/gcconfig.h +=================================================================== +--- uim-1.8.1.orig/sigscheme/libgcroots/include/private/gcconfig.h ++++ uim-1.8.1/sigscheme/libgcroots/include/private/gcconfig.h +@@ -62,6 +62,13 @@ + # endif + + /* Determine the machine type: */ ++# if defined(__aarch64__) ++# define AARCH64 ++# if !defined(LINUX) ++# define NOSYS ++# define mach_type_known ++# endif ++# endif + # if defined(__arm__) || defined(__thumb__) + # define ARM32 + # if !defined(LINUX) && !defined(NETBSD) +@@ -231,6 +238,10 @@ + # define IA64 + # define mach_type_known + # endif ++# if defined(LINUX) && defined(__aarch64__) ++# define AARCH64 ++# define mach_type_known ++# endif + # if defined(LINUX) && defined(__arm__) + # define ARM32 + # define mach_type_known +@@ -504,6 +515,7 @@ + /* running Amdahl UTS4 */ + /* S390 ==> 390-like machine */ + /* running LINUX */ ++ /* AARCH64 ==> ARM AArch64 */ + /* ARM32 ==> Intel StrongARM */ + /* IA64 ==> Intel IPF */ + /* (e.g. Itanium) */ +@@ -1724,6 +1736,31 @@ + # endif + # endif + ++# ifdef AARCH64 ++# define CPP_WORDSZ 64 ++# define MACH_TYPE "AARCH64" ++# define ALIGNMENT 8 ++# ifndef HBLKSIZE ++# define HBLKSIZE 4096 ++# endif ++# ifdef LINUX ++# define OS_TYPE "LINUX" ++# define LINUX_STACKBOTTOM ++# define DYNAMIC_LOADING ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++ extern char _end[]; ++# define DATAEND ((ptr_t)(&_end)) ++# endif ++# ifdef NOSYS ++ /* __data_start is usually defined in the target linker script. */ ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++ extern void *__stack_base__; ++# define STACKBOTTOM ((ptr_t)__stack_base__) ++# endif ++# endif ++ + # ifdef ARM32 + # define CPP_WORDSZ 32 + # define MACH_TYPE "ARM32" diff --git a/uim-sigscheme-build-fixes.diff b/uim-sigscheme-build-fixes.diff deleted file mode 100644 index 54edc9d..0000000 --- a/uim-sigscheme-build-fixes.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN uim-1.8.1.orig/sigscheme/libgcroots/Makefile.am uim-1.8.1/sigscheme/libgcroots/Makefile.am ---- uim-1.8.1.orig/sigscheme/libgcroots/Makefile.am 2012-07-02 12:16:36.432239740 +0800 -+++ uim-1.8.1/sigscheme/libgcroots/Makefile.am 2012-07-02 12:18:27.177855230 +0800 -@@ -19,6 +19,8 @@ - - include libtool-version.mk - -+ACLOCAL_AMFLAGS = -I m4 -+ - # $(distdir) does work as a part of $(RELEASE_URL) when configured as a - # subpackage. - DIST_NAME = $(PACKAGE)-$(VERSION) -diff -urN uim-1.8.1.orig/sigscheme/Makefile.am uim-1.8.1/sigscheme/Makefile.am ---- uim-1.8.1.orig/sigscheme/Makefile.am 2012-07-02 12:16:36.408240040 +0800 -+++ uim-1.8.1/sigscheme/Makefile.am 2012-07-02 12:17:58.557213036 +0800 -@@ -4,6 +4,8 @@ - endif - SUBDIRS += include src lib test test-c bench - -+ACLOCAL_AMFLAGS = -I m4 -+ - # To make 'make distclean' workable on --with-libgcroots=tiny-subdir, - # libgcroots must be eliminated from $DIST_SUBDIRS. - DIST_SUBDIRS = $(SUBDIRS) diff --git a/uim.changes b/uim.changes index ec48269..f742308 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 7 15:27:55 UTC 2013 - schwab@suse.de + +- libgcroots-aarch64.patch: Add support for aarch64 in libgcroots +- Don't regenerate configure + ------------------------------------------------------------------- Tue Apr 30 14:27:38 UTC 2013 - cfarrell@suse.com diff --git a/uim.spec b/uim.spec index 443883a..14cda42 100644 --- a/uim.spec +++ b/uim.spec @@ -31,9 +31,9 @@ Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim Source4: baselibs.conf -Patch1: uim-sigscheme-build-fixes.diff Patch2: uim-fix-crash-in-firefox.diff Patch3: fix-for-sles-qhash-incomplete-type.patch +Patch4: libgcroots-aarch64.patch BuildRequires: anthy-devel BuildRequires: canna-devel BuildRequires: emacs-x11 @@ -46,7 +46,6 @@ BuildRequires: kdebase3-devel BuildRequires: libedit-devel BuildRequires: libexpat-devel BuildRequires: libqt4-devel -BuildRequires: libtool BuildRequires: m17n-lib-devel BuildRequires: ncurses-devel BuildRequires: perl-XML-Parser @@ -145,17 +144,13 @@ languages. %prep %setup0 -q -%patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp emacs/README README.emacs iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs %build -autoreconf -f -i -intltoolize --force -cp po/Makefile.in.in qt3/chardict/po -cp po/Makefile.in.in qt4/chardict/po %configure --disable-static --with-pic \ --libexecdir=%{_prefix}/lib/uim \ --with-canna\