Hello community, here is the log from the commit of package asl for openSUSE:Factory checked in at 2020-09-25 16:31:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/asl (Old) and /work/SRC/openSUSE:Factory/.asl.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asl" Fri Sep 25 16:31:52 2020 rev:32 rq:835087 version:1.42_bld173 Changes: -------- --- /work/SRC/openSUSE:Factory/asl/asl.changes 2020-01-23 15:55:41.159119934 +0100 +++ /work/SRC/openSUSE:Factory/.asl.new.4249/asl.changes 2020-09-25 16:32:12.175925982 +0200 @@ -1,0 +2,13 @@ +Wed Sep 16 09:30:15 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 1.42_bld173. + See http://john.ccac.rwth-aachen.de:8000/as/changelog for the + changelog +- Update the license tag to GPL-2.0-only OR GPL-3.0-only to + match the license tag added to most files. +- Fixes for %_libexecdir changing to /usr/libexec (boo#1174075) +- Update asl-buildfixes.patch +- Merge asl-riscv64.patch and asl-ppc64.patch with + asl-buildfixes.patch + +------------------------------------------------------------------- Old: ---- asl-current-142-bld115.tar.bz2 asl-ppc64.patch asl-riscv64.patch New: ---- asl-current-142-bld173.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asl.spec ++++++ --- /var/tmp/diff_new_pack.TyX6El/_old 2020-09-25 16:32:12.871926600 +0200 +++ /var/tmp/diff_new_pack.TyX6El/_new 2020-09-25 16:32:12.875926604 +0200 @@ -17,15 +17,13 @@ Name: asl -Version: 1.42_bld144 +Version: 1.42_bld173 Release: 0 Summary: Macro Assembler AS -License: GPL-2.0-or-later +License: GPL-2.0-only OR GPL-3.0-only URL: http://john.ccac.rwth-aachen.de:8000/as/ -Source: http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-142-bld115.tar.bz2 +Source: http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-142-bld173.tar.bz2 Patch0: asl-buildfixes.patch -Patch2: asl-ppc64.patch -Patch3: asl-riscv64.patch BuildRequires: gcc-c++ Obsoletes: %{name}-doc @@ -36,10 +34,7 @@ workstations and PCs in the target list. %prep -%setup -q -n asl-current -%patch0 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n asl-current %build make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" @@ -48,79 +43,33 @@ make %{?_smp_mflags} test %install -%make_install PREFIX=%{buildroot} +%make_install INSTROOT=%{buildroot} %files %license COPYING %doc README TODO -%{_bindir}/asl +%dir %{_prefix}/lib/asl %{_bindir}/alink +%{_bindir}/asl %{_bindir}/p2bin %{_bindir}/p2hex %{_bindir}/pbind %{_bindir}/plist -%dir %{_includedir}/asl -%{_includedir}/asl/80c50x.inc -%{_includedir}/asl/80c552.inc -%{_includedir}/asl/bitfuncs.inc -%{_includedir}/asl/ctype.inc -%{_includedir}/asl/h8_3048.inc -%{_includedir}/asl/reg166.inc -%{_includedir}/asl/reg251.inc -%{_includedir}/asl/reg29k.inc -%{_includedir}/asl/reg53x.inc -%{_includedir}/asl/reg683xx.inc -%{_includedir}/asl/reg7000.inc -%{_includedir}/asl/reg78k0.inc -%{_includedir}/asl/reg96.inc -%{_includedir}/asl/regace.inc -%{_includedir}/asl/regavr.inc -%{_includedir}/asl/regcop8.inc -%{_includedir}/asl/reggp32.inc -%{_includedir}/asl/reghc08jb.inc -%{_includedir}/asl/reghc08q.inc -%{_includedir}/asl/reghc12.inc -%{_includedir}/asl/regm16c.inc -%{_includedir}/asl/regmsp.inc -%{_includedir}/asl/regst9.inc -%{_includedir}/asl/regz380.inc -%{_includedir}/asl/stddef04.inc -%{_includedir}/asl/stddef16.inc -%{_includedir}/asl/stddef17.inc -%{_includedir}/asl/stddef18.inc -%{_includedir}/asl/stddef2x.inc -%{_includedir}/asl/stddef37.inc -%{_includedir}/asl/stddef3x.inc -%{_includedir}/asl/stddef47.inc -%{_includedir}/asl/stddef51.inc -%{_includedir}/asl/stddef56k.inc -%{_includedir}/asl/stddef5x.inc -%{_includedir}/asl/stddef60.inc -%{_includedir}/asl/stddef62.inc -%{_includedir}/asl/stddef75.inc -%{_includedir}/asl/stddef87.inc -%{_includedir}/asl/stddef90.inc -%{_includedir}/asl/stddef96.inc -%{_includedir}/asl/stddefxa.inc -%{_includedir}/asl/stddefz8.inc -%{_includedir}/asl/reg6303.inc -%{_includedir}/asl/reg78310.inc -%{_includedir}/asl/stddef4x.inc -%dir %{_libexecdir}/asl -%{_libexecdir}/asl/as.msg -%{_libexecdir}/asl/alink.msg -%{_libexecdir}/asl/cmdarg.msg -%{_libexecdir}/asl/ioerrs.msg -%{_libexecdir}/asl/p2bin.msg -%{_libexecdir}/asl/p2hex.msg -%{_libexecdir}/asl/pbind.msg -%{_libexecdir}/asl/plist.msg -%{_libexecdir}/asl/tools.msg +%{_includedir}/asl/ +%{_mandir}/man1/alink.1%{?ext_man} %{_mandir}/man1/asl.1%{?ext_man} %{_mandir}/man1/p2bin.1%{?ext_man} %{_mandir}/man1/p2hex.1%{?ext_man} %{_mandir}/man1/pbind.1%{?ext_man} %{_mandir}/man1/plist.1%{?ext_man} -%{_mandir}/man1/alink.1%{?ext_man} +%{_prefix}/lib/asl/alink.msg +%{_prefix}/lib/asl/as.msg +%{_prefix}/lib/asl/cmdarg.msg +%{_prefix}/lib/asl/ioerrs.msg +%{_prefix}/lib/asl/p2bin.msg +%{_prefix}/lib/asl/p2hex.msg +%{_prefix}/lib/asl/pbind.msg +%{_prefix}/lib/asl/plist.msg +%{_prefix}/lib/asl/tools.msg %changelog ++++++ asl-buildfixes.patch ++++++ --- /var/tmp/diff_new_pack.TyX6El/_old 2020-09-25 16:32:12.899926625 +0200 +++ /var/tmp/diff_new_pack.TyX6El/_new 2020-09-25 16:32:12.903926629 +0200 @@ -1,70 +1,55 @@ -Index: asl-current/install.sh -=================================================================== ---- asl-current.orig/install.sh -+++ asl-current/install.sh -@@ -10,7 +10,7 @@ BINPATH=${PREFIX}$1 - INCPATH=${PREFIX}$2 - MANPATH=${PREFIX}$3 - LIBPATH=${PREFIX}$4 --DOCPATH=${PREFIX}$5 -+DOCPATH=$5 - - # this is not a perfect solution, but I don't know a better one at the moment: - -@@ -31,7 +31,6 @@ if [ "${BINPATH}" != "" ]; then - chmod 755 ${BINPATH} - for i in asl plist alink pbind p2hex p2bin; do - echo ${BINPATH}/$i -- strip $i - cp $i ${BINPATH} - chmod 755 ${BINPATH}/$i - done -@@ -74,7 +73,7 @@ if [ "${DOCPATH}" != "" ]; then - for i in DE EN; do - if [ -f doc_$i/as.html ]; then - echo ${DOCPATH}/as-$i.doc -- cp doc_$i/as.doc ${DOCPATH}/as-$i.doc -+ cp doc_$i/as.doc ${DOCPATH}/as-$i.txt - fi - echo ${DOCPATH}/as-$i.tex - cp doc_$i/as.tex ${DOCPATH}/as-$i.tex -@@ -96,6 +95,9 @@ if [ "${DOCPATH}" != "" ]; then - fi - chmod 644 ${DOCPATH}/as-$i.* - done -+ for i in README README.LANGS LICENSE BENCHES TODO ; do -+ cp $i $5/$i -+ done - cp doc_DE/taborg*.tex ${DOCPATH} - chmod 644 ${DOCPATH}/taborg*.tex - cp doc_DE/ps*.tex ${DOCPATH} -Index: asl-current/Makefile -=================================================================== ---- asl-current.orig/Makefile -+++ asl-current/Makefile -@@ -10,7 +10,8 @@ include objdefs.unix - - include makedefs.files - --ALLFLAGS = $(CFLAGS) -D$(CHARSET) -DSTDINCLUDES=\"$(INCDIR)\" -DLIBDIR=\"$(LIBDIR)\" -+# LDFLAGS = -DLIBDIR=\"$(LIBDIR)\" -+CPPFLAGS = -D$(CHARSET) -DSTDINCLUDES=\"$(INCDIR)\" -DLIBDIR=\"$(LIBDIR)\" +diff --git a/Makefile b/Makefile +index 5744918..65f5ab1 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,7 +18,7 @@ binaries: $(ALLTARGETS) + + binaries-das: $(DASLTARGET) $(DASMSGTARGETS) + +-all: binaries docs ++all: binaries + + include makedefs.src + +@@ -97,9 +97,9 @@ include $(OBJDIR)uumlobjs.dep + INCFILES = doc_COM/taborg*.tex doc_COM/tabids*.tex doc_COM/pscpu.tex doc_COM/pscomm.tex doc_COM/biblio.tex + + DOC_DE_DIR=doc_DE/ +-include $(DOC_DE_DIR)makedefs.dok ++# include $(DOC_DE_DIR)makedefs.dok + DOC_EN_DIR=doc_EN/ +-include $(DOC_EN_DIR)makedefs.dok ++# include $(DOC_EN_DIR)makedefs.dok #--------------------------------------------------------------------------- - # primary targets -Index: asl-current/Makefile.def -=================================================================== + # Supplementary Targets +diff --git a/Makefile.def b/Makefile.def +new file mode 100644 +index 0000000..d7f2b5a --- /dev/null -+++ asl-current/Makefile.def -@@ -0,0 +1,25 @@ ++++ b/Makefile.def +@@ -0,0 +1,31 @@ +# ------------------------------------------------------------------------- +# choose your compiler (must be ANSI-compliant!) and linker command, plus +# any additionally needed flags + ++OBJDIR = +CC = gcc -+LD = gcc +CFLAGS = -O2 -Wall ++HOST_OBJEXTENSION = .o ++LD = $(CC) +LDFLAGS = ++HOST_EXEXTENSION = ++ ++# no cross build ++ ++TARG_OBJDIR = $(OBJDIR) ++TARG_CC = $(CC) ++TARG_CFLAGS = $(CFLAGS) ++TARG_OBJEXTENSION = $(HOST_OBJEXTENSION) ++TARG_LD = $(LD) ++TARG_LDFLAGS = $(LDFLAGS) ++TARG_EXEXTENSION = $(HOST_EXEXTENSION) + +# ------------------------------------------------------------------------- +# directories where binaries, includes, and manpages should go during @@ -75,18 +60,42 @@ +MANDIR = /usr/share/man +LIBDIR = /usr/lib/asl +DOCDIR = doc -+ -+# ------------------------------------------------------------------------- -+# character encoding to use (choose one of them) -+ -+# CHARSET = CHARSET_ASCII7 -+# CHARSET = CHARSET_IBM437 -+CHARSET = CHARSET_ISO8859_1 -Index: asl-current/sysdefs.h -=================================================================== ---- asl-current.orig/sysdefs.h -+++ asl-current/sysdefs.h -@@ -138,6 +138,12 @@ +diff --git a/install.sh b/install.sh +index ea391b8..e972e2e 100755 +--- a/install.sh ++++ b/install.sh +@@ -10,7 +10,7 @@ BINPATH=${INSTROOT}$1 + INCPATH=${INSTROOT}$2 + MANPATH=${INSTROOT}$3 + LIBPATH=${INSTROOT}$4 +-DOCPATH=${INSTROOT}$5 ++DOCPATH=$5 + + # this is not a perfect solution, but I don't know a better one at the moment: + +@@ -31,7 +31,6 @@ if [ "${BINPATH}" != "" ]; then + chmod 755 ${BINPATH} + for i in asl plist alink pbind p2hex p2bin; do + #echo copy ${TARG_OBJDIR}$i${TARG_EXEXTENSION} to ${BINPATH}/$i${TARG_EXEXTENSION} ... +- strip ${TARG_OBJDIR}$i${TARG_EXEXTENSION} + if cp ${TARG_OBJDIR}$i${TARG_EXEXTENSION} ${BINPATH}; then + chmod 755 ${BINPATH}/$i${TARG_EXEXTENSION} + fi +@@ -103,6 +102,9 @@ if [ "${DOCPATH}" != "" ]; then + done + chmod 644 ${DOCPATH}/as_$i.* + done ++ for i in README README.LANGS LICENSE BENCHES TODO ; do ++ cp $i $5/$i ++ done + cp doc_COM/taborg*.tex ${DOCPATH} + chmod 644 ${DOCPATH}/taborg*.tex + cp doc_COM/ps*.tex ${DOCPATH} +diff --git a/sysdefs.h b/sysdefs.h +index c8b6a26..b4003fa 100644 +--- a/sysdefs.h ++++ b/sysdefs.h +@@ -140,6 +140,12 @@ # endif #endif @@ -99,7 +108,7 @@ /*---------------------------------------------------------------------------*/ /* ditto for ARM platforms */ -@@ -602,6 +608,29 @@ typedef unsigned long long Card64; +@@ -600,6 +606,29 @@ typedef unsigned long long Card64; #define LOCALE_NLS #endif @@ -129,12 +138,10 @@ #endif /* __hppa */ /*===========================================================================*/ -@@ -683,9 +712,42 @@ typedef unsigned long long Card64; - #define NO_NLS - #endif +@@ -683,6 +712,38 @@ typedef unsigned long long Card64; + + #endif /* _POWER */ -+#endif /* _POWER */ -+ +/*===========================================================================*/ +/* POWER64 platforms */ + @@ -143,7 +150,7 @@ +#define ARCHPRNAME "ppc64" + +/*---------------------------------------------------------------------------*/ -+/* POWER with Linux */ ++/* POWER64 with Linux */ + +#ifdef __linux__ +#define ARCHSYSNAME "unknown-linux" @@ -159,26 +166,21 @@ +#define HAS16 +typedef signed int Integ32; +typedef unsigned int Card32; -+typedef signed long Integ64; -+typedef unsigned long Card64; ++typedef signed long long Integ64; ++typedef unsigned long long Card64; +#define HAS64 +#define LOCALE_NLS +#endif + - #endif /* _POWER */ - - /*===========================================================================*/ ++#endif /* _POWER64 */ + + /*===========================================================================*/ /* VAX platforms */ - #ifdef __vax__ -@@ -1190,7 +1252,102 @@ typedef unsigned long long Card64; - #define LOCALE_NLS - #endif +@@ -1159,6 +1220,98 @@ typedef unsigned long Card32; + + #endif /* __i386 */ --#endif /* __k8__ */ -+#endif /* __x86_64__ */ -+ +#ifdef __ia64__ + +#define ARCHPRNAME "ia64" @@ -271,8 +273,45 @@ + + +#endif /* __s390x__ */ -+ -+ /*===========================================================================*/ /* Intel x86_64 platforms */ +@@ -1320,6 +1473,39 @@ typedef unsigned long long Card64; + + #endif /* __arm */ + ++/*===========================================================================*/ ++/* RISC-V platform */ ++ ++#if defined __riscv && __riscv_xlen == 64 ++ ++#define ARCHPRNAME "riscv64" ++ ++/*---------------------------------------------------------------------------*/ ++/* RISC-V 64-bit linux with GCC */ ++ ++#if defined __linux__ ++#define ARCHSYSNAME "unknown-linux" ++#define DEFSMADE ++#define OPENRDMODE "r" ++#define OPENWRMODE "w" ++#define OPENUPMODE "r+" ++#define IEEEFLOAT ++typedef signed char Integ8; ++typedef unsigned char Card8; ++typedef signed short Integ16; ++typedef unsigned short Card16; ++#define HAS16 ++typedef signed int Integ32; ++#define PRIInteg32 "d" ++typedef unsigned int Card32; ++typedef signed long Integ64; ++typedef unsigned long Card64; ++#define HAS64 ++#define LOCALE_NLS ++#endif /* __linux__ */ ++ ++#endif /* __riscv */ ++ + /*===========================================================================*/ + /* Misc... */ ++++++ asl-current-142-bld115.tar.bz2 -> asl-current-142-bld173.tar.bz2 ++++++ ++++ 290144 lines of diff (skipped)
