The package rpms/0ad.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/0ad.git/commit/?id=8bf98b6de987be....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit 67e2fa2f0b66e9aeb6256fe22df151efde41de8f
Author: Kalev Lember <klember(a)redhat.com>
Date: Sat May 23 08:49:35 2020 +0200
Backport workaround for Ryzen 3000 CPU support
https://bugzilla.redhat.com/show_bug.cgi?id=1822835
https://trac.wildfiregames.com/changeset/23262
diff --git a/0ad-ryzen-3000.patch b/0ad-ryzen-3000.patch
new file mode 100644
index 0000000..bf84ff2
--- /dev/null
+++ b/0ad-ryzen-3000.patch
@@ -0,0 +1,12 @@
+Index: trunk/source/lib/sysdep/arch/x86_x64/cache.cpp
+===================================================================
+--- trunk/source/lib/sysdep/arch/x86_x64/cache.cpp (revision 23261)
++++ trunk/source/lib/sysdep/arch/x86_x64/cache.cpp (revision 23262)
+@@ -90,5 +90,6 @@
+ {
+ 0, 1, 2, 0, 4, 0, 8, 0,
+- 16, 0, 32, 48, 64, 96, 128, x86_x64::Cache::fullyAssociative
++ // TODO: The second '16' does not obey to the specifications and is only a
workaround. For a correct implementation please look here:
https://community.amd.com/thread/244207
++ 16, 16, 32, 48, 64, 96, 128, x86_x64::Cache::fullyAssociative
+ };
+
diff --git a/0ad.spec b/0ad.spec
index d57da29..ccd9287 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -25,7 +25,7 @@
Name: 0ad
Version: 0.0.23b
-Release: 14%{?dist}
+Release: 15%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@@ -147,6 +147,11 @@ Patch6: %{name}-mozjs38.patch
#
https://bugzilla.redhat.com/show_bug.cgi?id=1799112
Patch7: %{name}-fcollada.patch
+# Workaround for Ryzen 3000 CPU support
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1822835
+#
https://trac.wildfiregames.com/changeset/23262
+Patch8: 0ad-ryzen-3000.patch
+
%description
0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
real-time strategy (RTS) game of ancient warfare. In short, it is a
@@ -177,6 +182,7 @@ sed -i "s/\(-fno-delete-null-pointer-checks\)/\1 -O0/" \
#end Related to 0ad-mozjs38.patch
%patch7 -p1
+%patch8 -p1
%if %{with system_nvtt}
rm -fr libraries/source/nvtt
@@ -279,6 +285,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/0ad.desktop
%{_mandir}/man6/*.6*
%changelog
+* Sat May 23 2020 Kalev Lember <klember(a)redhat.com> - 0.0.23b-15
+- Backport workaround for Ryzen 3000 CPU support (#1822835)
+
* Sun May 17 2020 Pete Walter <pwalter(a)fedoraproject.org> - 0.0.23b-14
- Rebuild for ICU 67
commit e566c2677dfffb615a55917a68136c1cdcaf5060
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Sun May 17 07:58:49 2020 +0100
Rebuild for ICU 67
diff --git a/0ad.spec b/0ad.spec
index 162ce0f..d57da29 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -25,7 +25,7 @@
Name: 0ad
Version: 0.0.23b
-Release: 13%{?dist}
+Release: 14%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@@ -279,6 +279,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/0ad.desktop
%{_mandir}/man6/*.6*
%changelog
+* Sun May 17 2020 Pete Walter <pwalter(a)fedoraproject.org> - 0.0.23b-14
+- Rebuild for ICU 67
+
* Tue Mar 31 2020 <paulo.cesar.pereira.de.andrade(a)gmail.com> - 0.0.23b-13
- Fix Fedora 32 FTBFS (#1799112)
commit 8af65c43e11e7313993bf8eb083df0f8f6c6a6b1
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Apr 2 14:04:51 2020 -0300
Escape rpm macros
diff --git a/0ad.spec b/0ad.spec
index 21da18b..162ce0f 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -60,8 +60,8 @@
Source0:
http://releases.wildfiregames.com/%{name}-%{version}-alpha-unix-build.t
# Simplify checking differences when updating the package
# (also to validate one did not forget to remake the tarball if
# %{without_nvtt} is enabled) Create it with:
-# cd BUILD/%{name}-%{version}-alpha
-# licensecheck -r . | sort > ../../SOURCES/%{name}-licensecheck.txt
+# cd BUILD/%%{name}-%%{version}-alpha
+# licensecheck -r . | sort > ../../SOURCES/%%{name}-licensecheck.txt
Source1: %{name}-licensecheck.txt
# adapted from binaries/system/readme.txt
commit b3c0ccd836fae9f19f860eeab84cd6f90cbda160
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Apr 2 13:14:20 2020 -0300
Use available python-devel (#1807956)
diff --git a/0ad.spec b/0ad.spec
index a0ba9a2..21da18b 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -114,7 +114,7 @@ BuildRequires: /usr/bin/zip
%endif
# bundled mozjs: For build time tests only
-BuildRequires: python2-devel
+BuildRequires: python-devel
BuildRequires: perl-devel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
commit 892287221734eb66973075db49bef9e7fe2f5bee
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Apr 2 09:20:30 2020 -0300
Update 0ad-fcollada.patch (#1819270#c5)
diff --git a/0ad-fcollada.patch b/0ad-fcollada.patch
index ed4fb4e..1a5ba23 100644
--- a/0ad-fcollada.patch
+++ b/0ad-fcollada.patch
@@ -19,21 +19,6 @@ diff -up
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiv
//
-diff -up
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXInstanceExport.cpp.orig
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXInstanceExport.cpp
----
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXInstanceExport.cpp.orig 2020-03-31
10:12:21.966450794 -0300
-+++
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXInstanceExport.cpp 2020-03-31
10:39:01.336673159 -0300
-@@ -255,8 +255,9 @@ xmlNode* FArchiveXML::WritePhysicsRigidB
- xmlNode* techniqueNode = AddChild(instanceNode, DAE_TECHNIQUE_COMMON_ELEMENT);
-
- // almost same as FCDPhysicsRigidBody
-- FArchiveXML::AddPhysicsParameter(techniqueNode, DAE_ANGULAR_VELOCITY_ELEMENT,
physicsRigidBodyInstance->GetAngularVelocity());
-- FArchiveXML::AddPhysicsParameter(techniqueNode, DAE_VELOCITY_ELEMENT,
physicsRigidBodyInstance->GetVelocity());
-+ static FArchiveXML archive;
-+ archive.AddPhysicsParameter(techniqueNode, DAE_ANGULAR_VELOCITY_ELEMENT,
physicsRigidBodyInstance->GetAngularVelocity());
-+ archive.AddPhysicsParameter(techniqueNode, DAE_VELOCITY_ELEMENT,
physicsRigidBodyInstance->GetVelocity());
-
FArchiveXML::WritePhysicsRigidBodyParameters(physicsRigidBodyInstance->GetParameters(),
techniqueNode);
-
- FArchiveXML::WriteEntityInstanceExtra(physicsRigidBodyInstance, instanceNode);
diff -up
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
---
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig 2008-09-07
19:13:25.000000000 -0300
+++
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp 2020-03-31
11:43:24.577115067 -0300
commit a544c594cbf6dea76160dd338e75166390b6de2d
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Tue Mar 31 12:11:27 2020 -0300
Fix Fedora 32 FTBFS (#1799112)
diff --git a/0ad-fcollada.patch b/0ad-fcollada.patch
new file mode 100644
index 0000000..ed4fb4e
--- /dev/null
+++ b/0ad-fcollada.patch
@@ -0,0 +1,56 @@
+diff -up
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
+---
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig 2020-03-30
16:28:20.011982827 -0300
++++
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h 2020-03-31
11:43:27.669098382 -0300
+@@ -553,7 +553,16 @@ public:
+
+ static void WritePhysicsRigidBodyParameters(FCDPhysicsRigidBodyParameters*
physicsRigidBodyParameters, xmlNode* techniqueNode);
+ template <class TYPE, int QUAL>
+- static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name,
FCDParameterAnimatableT<TYPE,QUAL>& value);
++ static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name,
FCDParameterAnimatableT<TYPE,QUAL>& value) {
++ xmlNode* paramNode = AddChild(parentNode, name);
++ AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
++ if (value.IsAnimated())
++ {
++ const FCDAnimated* animated = value.GetAnimated();
++ FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
++ }
++ return paramNode;
++ }
+
+
+ //
+diff -up
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXInstanceExport.cpp.orig
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXInstanceExport.cpp
+---
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXInstanceExport.cpp.orig 2020-03-31
10:12:21.966450794 -0300
++++
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXInstanceExport.cpp 2020-03-31
10:39:01.336673159 -0300
+@@ -255,8 +255,9 @@ xmlNode* FArchiveXML::WritePhysicsRigidB
+ xmlNode* techniqueNode = AddChild(instanceNode, DAE_TECHNIQUE_COMMON_ELEMENT);
+
+ // almost same as FCDPhysicsRigidBody
+- FArchiveXML::AddPhysicsParameter(techniqueNode, DAE_ANGULAR_VELOCITY_ELEMENT,
physicsRigidBodyInstance->GetAngularVelocity());
+- FArchiveXML::AddPhysicsParameter(techniqueNode, DAE_VELOCITY_ELEMENT,
physicsRigidBodyInstance->GetVelocity());
++ static FArchiveXML archive;
++ archive.AddPhysicsParameter(techniqueNode, DAE_ANGULAR_VELOCITY_ELEMENT,
physicsRigidBodyInstance->GetAngularVelocity());
++ archive.AddPhysicsParameter(techniqueNode, DAE_VELOCITY_ELEMENT,
physicsRigidBodyInstance->GetVelocity());
+
FArchiveXML::WritePhysicsRigidBodyParameters(physicsRigidBodyInstance->GetParameters(),
techniqueNode);
+
+ FArchiveXML::WriteEntityInstanceExtra(physicsRigidBodyInstance, instanceNode);
+diff -up
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
+---
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig 2008-09-07
19:13:25.000000000 -0300
++++
0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp 2020-03-31
11:43:24.577115067 -0300
+@@ -329,16 +329,3 @@ void FArchiveXML::WritePhysicsRigidBodyP
+ FArchiveXML::LetWriteObject(physicsRigidBodyParameters->GetPhysicsShape(i),
techniqueNode);
+ }
+ }
+-
+-template <class TYPE, int QUAL>
+-xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name,
FCDParameterAnimatableT<TYPE,QUAL>& value)
+-{
+- xmlNode* paramNode = AddChild(parentNode, name);
+- AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
+- if (value.IsAnimated())
+- {
+- const FCDAnimated* animated = value.GetAnimated();
+- FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
+- }
+- return paramNode;
+-}
diff --git a/0ad.spec b/0ad.spec
index 35ff533..a0ba9a2 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -25,7 +25,7 @@
Name: 0ad
Version: 0.0.23b
-Release: 12%{?dist}
+Release: 13%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@@ -140,6 +140,13 @@ Patch5: %{name}-ppc64.patch
#
https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd6...
Patch6: %{name}-mozjs38.patch
+# Possibly a gcc 10 or binutils 2.34 ld bug. Likely there is an explanation,
+# but could not create a simple reproducer.
+# Workaround was a single template declaration/definition by defining the
+# template in the header file with the class declaration.
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1799112
+Patch7: %{name}-fcollada.patch
+
%description
0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
real-time strategy (RTS) game of ancient warfare. In short, it is a
@@ -169,6 +176,8 @@ sed -i "s/\(-fno-delete-null-pointer-checks\)/\1 -O0/" \
%endif
#end Related to 0ad-mozjs38.patch
+%patch7 -p1
+
%if %{with system_nvtt}
rm -fr libraries/source/nvtt
%endif
@@ -270,6 +279,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/0ad.desktop
%{_mandir}/man6/*.6*
%changelog
+* Tue Mar 31 2020 <paulo.cesar.pereira.de.andrade(a)gmail.com> - 0.0.23b-13
+- Fix Fedora 32 FTBFS (#1799112)
+
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.0.23b-12
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 28bf76948269b98814f46886691d70e1db494dfe
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 28 09:06:20 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/0ad.spec b/0ad.spec
index 12015b0..35ff533 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -25,7 +25,7 @@
Name: 0ad
Version: 0.0.23b
-Release: 11%{?dist}
+Release: 12%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@@ -270,6 +270,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/0ad.desktop
%{_mandir}/man6/*.6*
%changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.0.23b-12
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Fri Nov 01 2019 Pete Walter <pwalter(a)fedoraproject.org> - 0.0.23b-11
- Rebuild for ICU 65
commit 91cd1b1b6c0b831088fd4f761da12c7180681968
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Fri Nov 1 16:05:01 2019 +0000
Rebuild for ICU 65
diff --git a/0ad.spec b/0ad.spec
index c1a6846..12015b0 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -25,7 +25,7 @@
Name: 0ad
Version: 0.0.23b
-Release: 10%{?dist}
+Release: 11%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@@ -270,6 +270,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/0ad.desktop
%{_mandir}/man6/*.6*
%changelog
+* Fri Nov 01 2019 Pete Walter <pwalter(a)fedoraproject.org> - 0.0.23b-11
+- Rebuild for ICU 65
+
* Mon Sep 30 2019 pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com> - 0.0.23b-10
- Add build conditional for system mozjs38
commit 8bf98b6de987be4d0e7893f49a96aeb8b93857e8
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Mon Sep 30 18:00:37 2019 -0300
Add patches previously only on mozjs38 package
The patch corrects some known issues, and hopefully will reduce
user reports of problems.
diff --git a/0ad-mozjs38.patch b/0ad-mozjs38.patch
new file mode 100644
index 0000000..7d2e6c4
--- /dev/null
+++ b/0ad-mozjs38.patch
@@ -0,0 +1,21 @@
+diff -up 0ad-0.0.23b-alpha/libraries/source/spidermonkey/build.sh.orig
0ad-0.0.23b-alpha/libraries/source/spidermonkey/build.sh
+--- 0ad-0.0.23b-alpha/libraries/source/spidermonkey/build.sh.orig 2019-09-30
15:33:27.690089303 -0300
++++ 0ad-0.0.23b-alpha/libraries/source/spidermonkey/build.sh 2019-09-30
15:47:16.201374941 -0300
+@@ -27,7 +27,7 @@ fi
+
+ MAKE_OPTS="${JOBS}"
+
+-CONF_OPTS="--enable-shared-js --disable-tests --without-intl-api"
++CONF_OPTS="--enable-shared-js --disable-tests --without-intl-api
--disable-optimize"
+
+ # Bug 1269319
+ # When compiled with GCC 6 (or later), SpiderMonkey 38 (and versions up to 49) is
+@@ -37,7 +37,7 @@ if [ "${OS}" != "Windows_NT" ]
+ then
+ if [ "`${CXX:=g++} -dumpversion | cut -f1 -d.`" -ge "6" ]
+ then
+- CXXFLAGS="${CXXFLAGS} -fno-schedule-insns2
-fno-delete-null-pointer-checks"
++ CXXFLAGS="${CXXFLAGS} -fpermissive -fno-tree-vrp -fno-strict-aliasing
-fno-schedule-insns2 -fno-delete-null-pointer-checks"
+ fi
+ fi
+
diff --git a/0ad.spec b/0ad.spec
index cbebc15..c1a6846 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -133,6 +133,13 @@ Patch3: %{name}-valgrind.patch
# Fix build on ppc64le with patches from
https://wiki.raptorcs.com/wiki/Porting/0ad
Patch5: %{name}-ppc64.patch
+# Due to significant reports matching:
+#
https://trac.wildfiregames.com/ticket/4053
+# [[PATCH] Building spidermonkey on GCC 6 results in segfaults in the Garbage Collector]
+# Basically reinstantiate:
+#
https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd6...
+Patch6: %{name}-mozjs38.patch
+
%description
0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
real-time strategy (RTS) game of ancient warfare. In short, it is a
@@ -154,6 +161,13 @@ hobbyist game developers, since 2001.
%endif
%patch3 -p1
%patch5 -p1
+%patch6 -p1
+# Related to 0ad-mozjs38.patch
+%ifarch %{ix86}
+sed -i "s/\(-fno-delete-null-pointer-checks\)/\1 -O0/" \
+ libraries/source/spidermonkey/build.sh
+%endif
+#end Related to 0ad-mozjs38.patch
%if %{with system_nvtt}
rm -fr libraries/source/nvtt
commit e587ab95b50a1b9ce8c747c240c85426dfcf5899
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Mon Sep 30 15:25:15 2019 -0300
Add build conditional for system mozjs38
This should work as a template whenever there is a new mozjs.
Also merged my local changes in the install of bundled mozjs.
diff --git a/0ad.spec b/0ad.spec
index cd467df..cbebc15 100644
--- a/0ad.spec
+++ b/0ad.spec
@@ -10,6 +10,8 @@
%global dbg %{nil}
%endif
+%bcond_with system_mozjs38
+
# Remember to rerun licensecheck after every update:
#
https://bugzilla.redhat.com/show_bug.cgi?id=818401#c46
#
http://trac.wildfiregames.com/ticket/1682
@@ -23,7 +25,7 @@
Name: 0ad
Version: 0.0.23b
-Release: 9%{?dist}
+Release: 10%{?dist}
# BSD License:
# build/premake/*
# libraries/source/miniupnpc/* (not built/used)
@@ -102,12 +104,14 @@ BuildRequires: wxGTK3-devel
BuildRequires: /usr/bin/appstream-util
BuildRequires: /usr/bin/python
+%if %{without system_mozjs38}
# bundled mozjs
BuildRequires: pkgconfig(nspr)
BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(zlib)
BuildRequires: readline-devel
BuildRequires: /usr/bin/zip
+%endif
# bundled mozjs: For build time tests only
BuildRequires: python2-devel
@@ -115,7 +119,9 @@ BuildRequires: perl-devel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
+%if %{without system_mozjs38}
Provides: bundled(mozjs) = 38
+%endif
# Only do fcollada debug build with enabling debug maintainer mode
# It also prevents assumption there that it is building in x86
@@ -164,6 +170,9 @@ build/workspaces/update-workspaces.sh \
--bindir=%{_bindir} \
--datadir=%{_datadir}/%{name} \
--libdir=%{_libdir}/%{name} \
+%if %{with system_mozjs38}
+ --with-system-mozjs38 \
+%endif
%if %{with system_nvtt}
--with-system-nvtt \
%endif
@@ -191,10 +200,13 @@ for name in nvcore nvimage nvmath nvtt; do
done
%endif
+%if %{without system_mozjs38}
%if %{with debug}
- install -p -m 755 binaries/system/libmozjs38-ps-debug.so
%{buildroot}%{_libdir}/%{name}/libmozjs38-ps-debug.so
+name=mozjs38-ps-debug
%else
- install -p -m 755 binaries/system/libmozjs38-ps-release.so
%{buildroot}%{_libdir}/%{name}/libmozjs38-ps-release.so
+name=mozjs38-ps-release
+%endif
+install -p -m 755 binaries/system/lib${name}.so
%{buildroot}%{_libdir}/%{name}/lib${name}.so
%endif
install -d -m 755 %{buildroot}%{_datadir}/metainfo
@@ -244,6 +256,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/0ad.desktop
%{_mandir}/man6/*.6*
%changelog
+* Mon Sep 30 2019 pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com> - 0.0.23b-10
+- Add build conditional for system mozjs38
+
* Wed Sep 11 2019 Kalev Lember <klember(a)redhat.com> - 0.0.23b-9
- Correctly install bundled mozjs38 (#1751250)
- Exclude private libraries from autogenerated provides and requires