Accepting request 130118 from home:computersalat:devel:compiler

update to 1.2.0

OBS-URL: https://build.opensuse.org/request/show/130118
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/yasm?expand=0&rev=11

yasm-1.1.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1c1f0c839d558420c1bed9c6e199dcca2d3431e3e2959d507c8af542d5b0d90
-size 1151464

yasm-1.2.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31
+size 1436502

yasm-no-build-date.patch

@@ -1,22 +1,24 @@
 Index: frontends/tasm/tasm.c
-================================================================================
+===================================================================
---- frontends/tasm/tasm.c
+--- frontends/tasm/tasm.c.orig
 +++ frontends/tasm/tasm.c
-@@ -225,7 +225,6 @@
+@@ -224,7 +224,6 @@ static opt_option options[] =
  /* version message */
  /*@observer@*/ static const char *version_msg[] = {
-     PACKAGE_NAME " " PACKAGE_INTVER "." PACKAGE_BUILD,
+     PACKAGE_STRING,
 -    "Compiled on " __DATE__ ".",
      "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.",
      "Run yasm --license for licensing overview and summary."
  };
---- frontends/yasm/yasm.c
+Index: frontends/yasm/yasm.c
+===================================================================
+--- frontends/yasm/yasm.c.orig
 +++ frontends/yasm/yasm.c
-@@ -214,7 +214,6 @@
+@@ -213,7 +213,6 @@ static opt_option options[] =
  /* version message */
  /*@observer@*/ static const char *version_msg[] = {
-     PACKAGE_NAME " " PACKAGE_INTVER "." PACKAGE_BUILD,
+     PACKAGE_STRING,
 -    "Compiled on " __DATE__ ".",
-     "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.",
+     "Copyright (c) 2001-2011 Peter Johnson and other Yasm developers.",
      "Run yasm --license for licensing overview and summary."
  };

yasm-no-rpm-opt-flags.patch

@@ -0,0 +1,68 @@
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
++++ Makefile.in
+@@ -4051,7 +4051,7 @@ version.mac: genversion$(EXEEXT)
+ 	$(top_builddir)/genversion$(EXEEXT) $@
+ 
+ genversion.$(OBJEXT): modules/preprocs/nasm/genversion.c
+-	$(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f modules/preprocs/nasm/genversion.c || echo '$(srcdir)/'`modules/preprocs/nasm/genversion.c
++	$(CC_FOR_BUILD) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f modules/preprocs/nasm/genversion.c || echo '$(srcdir)/'`modules/preprocs/nasm/genversion.c
+ 
+ #EXTRA_DIST += modules/preprocs/gas/tests/rawpp_test.sh
+ #EXTRA_DIST += modules/preprocs/gas/tests/longline.asm
+@@ -4078,7 +4078,7 @@ module.c: $(top_srcdir)/libyasm/module.i
+ 	$(top_builddir)/genmodule$(EXEEXT) $(top_srcdir)/libyasm/module.in Makefile
+ 
+ genmodule.$(OBJEXT): libyasm/genmodule.c
+-	$(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f libyasm/genmodule.c || echo '$(srcdir)/'`libyasm/genmodule.c
++	$(CC_FOR_BUILD) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f libyasm/genmodule.c || echo '$(srcdir)/'`libyasm/genmodule.c
+ 
+ @BUILD_MAN_TRUE@yasm.1: frontends/yasm/yasm.xml
+ @BUILD_MAN_TRUE@	$(XMLTO) -o $(top_builddir) man $(srcdir)/frontends/yasm/yasm.xml
+@@ -4110,7 +4110,7 @@ install-exec-hook: python-install
+ uninstall-hook: python-uninstall
+ 
+ genstring.$(OBJEXT): genstring.c
+-	$(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f genstring.c || echo '$(srcdir)/'`genstring.c
++	$(CC_FOR_BUILD) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f genstring.c || echo '$(srcdir)/'`genstring.c
+ 
+ # 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.
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
+@@ -158,5 +158,5 @@ genstring_LDADD = genstring.$(OBJEXT)
+ genstring_LINK = $(CCLD_FOR_BUILD) -o $@
+ 
+ genstring.$(OBJEXT): genstring.c
+-	$(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f genstring.c || echo '$(srcdir)/'`genstring.c
++	$(CC_FOR_BUILD) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f genstring.c || echo '$(srcdir)/'`genstring.c
+ 
+Index: libyasm/Makefile.inc
+===================================================================
+--- libyasm/Makefile.inc.orig
++++ libyasm/Makefile.inc
+@@ -41,7 +41,7 @@ genmodule_LDADD = genmodule.$(OBJEXT)
+ genmodule_LINK = $(CCLD_FOR_BUILD) -o $@
+ 
+ genmodule.$(OBJEXT): libyasm/genmodule.c
+-	$(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f libyasm/genmodule.c || echo '$(srcdir)/'`libyasm/genmodule.c
++	$(CC_FOR_BUILD) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f libyasm/genmodule.c || echo '$(srcdir)/'`libyasm/genmodule.c
+ 
+ EXTRA_DIST += libyasm/module.in
+ 
+Index: modules/preprocs/nasm/Makefile.inc
+===================================================================
+--- modules/preprocs/nasm/Makefile.inc.orig
++++ modules/preprocs/nasm/Makefile.inc
+@@ -31,7 +31,7 @@ genversion_LDADD = genversion.$(OBJEXT)
+ genversion_LINK = $(CCLD_FOR_BUILD) -o $@
+ 
+ genversion.$(OBJEXT): modules/preprocs/nasm/genversion.c
+-	$(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f modules/preprocs/nasm/genversion.c || echo '$(srcdir)/'`modules/preprocs/nasm/genversion.c
++	$(CC_FOR_BUILD) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ `test -f modules/preprocs/nasm/genversion.c || echo '$(srcdir)/'`modules/preprocs/nasm/genversion.c
+ 
+ EXTRA_DIST += modules/preprocs/nasm/tests/Makefile.inc
+ 

yasm.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Aug  6 13:53:00 UTC 2012 - chris@computersalat.de
+
+- update to 1.2.0
+  * Add AVX2 instructions (rev 11 of Intel AVX reference) (#227).
+  * Allow 64-bit LFS/LGS/LSS.
+  * Improve LAR instruction support (#224).
+  * Default win64 .xdata to nobase, add support for “..imagebase” (#135).
+  * Fix “TIMES” relocation handling.
+  * Fix no-suffix push and pop in GAS mode (#212).
+  * See the bug tracker for a full list of bug fixes.
+- rebase no-build-date patch
+- add yasm-no-rpm-opt-flags patch
+- fix License
+  * Artistic-1.0, BSD-2-Clause, BSD-3-Clause, GPL-2.0+, LGPL-2.0+
+
 -------------------------------------------------------------------
 Sun Oct 24 00:02:36 CEST 2010 - ro@suse.de
 

yasm.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package yasm (Version 1.1.0)
+# spec file for package yasm
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,21 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           yasm
-Url:            http://www.tortall.net/projects/yasm/
-License:        BSD3c
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Version:        1.1.0
-Release:        6
 Summary:        A complete rewrite of the NASM assembler
-Source:         yasm-%{version}.tar.bz2
+License:        Artistic-1.0, BSD-2-Clause, BSD-3-Clause, GPL-2.0+, LGPL-2.0+
+Group:          Development/Languages/Other
+Version:        1.2.0
+Release:        0
+Url:            http://www.tortall.net/projects/yasm/
+Source:         %{name}-%{version}.tar.gz
+Patch0:         %{name}-no-build-date.patch
+Patch1:         %{name}-no-rpm-opt-flags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python
-Patch:          yasm-no-build-date.patch
+BuildRequires:  xmlto
 
 %description
 YASM is a complete rewrite of the NASM assembler. It is designed from
@@ -38,52 +37,41 @@ NASM, TASM, GAS, etc.) in addition to multiple output object formats.
 Another primary module of the overall design is an optimizer module.
 Actually it supports ix86 and AMD64, next will be PowerPC
 
-
-
-Authors:
---------
-    Peter Johnson <peter@tortall.net>
-
 %package devel
-License:        BSD3c
 Summary:        YASM development package
 Group:          Development/Languages/Other
-AutoReqProv:    on
 Requires:       %{name} = %{version}
 
 %description devel
 This package includes everything needed to develop programs that use
 libyasm.
 
-
-
-Authors:
---------
-    Peter Johnson <peter@tortall.net>
-
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
-%patch
+%patch0
+%patch1
 
 %build
 export CFLAGS="%{optflags}" 
-%configure --prefix=/usr --with-gnu-ld --enable-python
+%configure \
-make %{?jobs:-j%jobs}
+ --with-gnu-ld \
+ --enable-python
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=%buildroot  install 
+%makeinstall
-
-%clean
-rm -rf %buildroot
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+%clean
+%{__rm} -rf %{buildroot}
+
 %files
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS Artistic.txt BSD.txt COPYING GNU_GPL-2.0
+%doc Artistic.txt BSD.txt COPYING GNU_GPL-2.0 GNU_LGPL-2.0
-%doc GNU_LGPL-2.0
+%doc ABOUT-NLS AUTHORS ChangeLog NEWS README
 /usr/bin/*
 %_mandir/man7/*
 %_mandir/man1/*