2 Commits

Author SHA256 Message Date
deb8128981 Accepting request 1245734 from devel:tools:compiler
OBS-URL: https://build.opensuse.org/request/show/1245734
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yasm?expand=0&rev=34
2025-02-14 18:19:57 +00:00
08deb002f3 - modified patches
% yasm-no-rpm-opt-flags.patch (refreshed)
- added patches
  fix https://github.com/yasm/yasm/issues/283
  + yasm-gcc15.patch

Let me learn from my errors :).

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/yasm?expand=0&rev=37
2025-02-13 17:24:19 +00:00
4 changed files with 53 additions and 17 deletions

29
yasm-gcc15.patch Normal file
View File

@@ -0,0 +1,29 @@
diff -upr yasm-1.3.0.orig/libyasm/bitvect.h yasm-1.3.0/libyasm/bitvect.h
--- yasm-1.3.0.orig/libyasm/bitvect.h 2011-08-28 01:13:19.000000000 +0200
+++ yasm-1.3.0/libyasm/bitvect.h 2025-02-13 10:25:48.009772943 +0100
@@ -5,7 +5,7 @@
/*****************************************************************************/
/* MODULE IMPORTS: */
/*****************************************************************************/
-
+#include <stdbool.h>
/* ToolBox.h */
/*****************************************************************************/
/* NOTE: The type names that have been chosen here are somewhat weird on */
@@ -77,15 +77,7 @@ typedef Z_longword *Z_longwordp
#define TRUE (0==0)
#endif
-#ifdef __cplusplus
- typedef bool boolean;
-#else
- #ifdef MACOS_TRADITIONAL
- #define boolean Boolean
- #else
- typedef enum boolean { false = FALSE, true = TRUE } boolean;
- #endif
-#endif
+typedef bool boolean;
/*****************************************************************************/
/* MODULE INTERFACE: */

View File

@@ -1,7 +1,7 @@
Index: Makefile.in
===================================================================
--- Makefile.in.orig
+++ Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -4051,7 +4051,7 @@ version.mac: genversion$(EXEEXT)
$(top_builddir)/genversion$(EXEEXT) $@
@@ -31,8 +31,8 @@ Index: Makefile.in
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,5 +158,5 @@ genstring_LDADD = genstring.$(OBJEXT)
genstring_LINK = $(CCLD_FOR_BUILD) -o $@
@@ -42,8 +42,8 @@ Index: Makefile.am
Index: libyasm/Makefile.inc
===================================================================
--- libyasm/Makefile.inc.orig
+++ libyasm/Makefile.inc
--- a/libyasm/Makefile.inc
+++ b/libyasm/Makefile.inc
@@ -41,7 +41,7 @@ genmodule_LDADD = genmodule.$(OBJEXT)
genmodule_LINK = $(CCLD_FOR_BUILD) -o $@
@@ -55,8 +55,8 @@ Index: libyasm/Makefile.inc
Index: modules/preprocs/nasm/Makefile.inc
===================================================================
--- modules/preprocs/nasm/Makefile.inc.orig
+++ modules/preprocs/nasm/Makefile.inc
--- a/modules/preprocs/nasm/Makefile.inc.orig
+++ b/modules/preprocs/nasm/Makefile.inc
@@ -31,7 +31,7 @@ genversion_LDADD = genversion.$(OBJEXT)
genversion_LINK = $(CCLD_FOR_BUILD) -o $@

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Feb 13 09:32:53 UTC 2025 - pgajdos@suse.com
- modified patches
% yasm-no-rpm-opt-flags.patch (refreshed)
- added patches
fix https://github.com/yasm/yasm/issues/283
+ yasm-gcc15.patch
-------------------------------------------------------------------
Tue Feb 20 13:02:03 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@@ -1,7 +1,7 @@
#
# spec file for package yasm
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,12 +22,14 @@ Release: 0
Summary: A complete rewrite of the NASM assembler
License: Artistic-1.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.0-or-later
Group: Development/Languages/Other
URL: http://www.tortall.net/projects/yasm/
URL: https://github.com/yasm/yasm
Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz
Patch0: %{name}-no-build-date.patch
Patch1: %{name}-no-rpm-opt-flags.patch
Patch0: yasm-no-build-date.patch
Patch1: yasm-no-rpm-opt-flags.patch
Patch2: yasm-re2c-nogendate.patch
Patch3: yasm-Update-elf-objfmt.c.patch
# https://github.com/yasm/yasm/issues/283
Patch4: yasm-gcc15.patch
BuildRequires: python3-devel
BuildRequires: xmlto
@@ -48,11 +50,7 @@ This package includes everything needed to develop programs that use
libyasm.
%prep
%setup -q
%patch -P 0 -p1
%patch -P 1
%patch -P 2 -p1
%patch -P 3 -p1
%autosetup -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects