Browse Source

updated 7 packages

clang-19.1.3-1

compiler-rt-19.1.3-1

lld-19.1.3-1

lldb-19.1.3-1

llvm-19.1.3-1

libomp-19.1.3-1

vine-rpm-macros-10-1
Tomohiro "Tomo-p" KATO 6 months ago
parent
commit
b77aebca18

+ 56 - 54
c/clang/clang-vl.spec

@@ -1,5 +1,17 @@
 %bcond_with test
 
+%global reduce_debuginfo 1
+
+%ifarch %ix86
+%bcond_with lto_build
+%else
+%bcond_without lto_build
+%endif
+
+%if %{without lto_build}
+%global _lto_cflags %{nil}
+%endif
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %define ver_suffix %(echo "%{version}" | cut -d . -f 1)
@@ -14,7 +26,7 @@
 Summary:        A C language family front-end for LLVM
 Summary(ja):    LLVM の C 言語フロントエンド
 Name:           clang
-Version:        18.1.5
+Version:        19.1.3
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -26,26 +38,11 @@ Source0:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%
 Source1:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/clang-tools-extra-%{version}.src.tar.xz
 
 # multilib fixes
-Source11:   clang-config.h
+Source11:       clang-config.h
 
 # Patches for clang
-Patch1:     0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
-Patch2:     0003-PATCH-clang-Don-t-install-static-libraries.patch
-
-# Workaround a bug in ORC on ppc64le.
-# More info is available here: https://reviews.llvm.org/D159115#4641826
-Patch5:     0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
-
-# RHEL specific patches
-# Avoid unwanted dependency on python-myst-parser
-Patch101:  0009-disable-myst-parser.patch
-
-%if %{without compat_build}
-# Patches for clang-tools-extra
-# See https://reviews.llvm.org/D120301
-Patch201:   0001-clang-tools-extra-Make-test-dependency-on-LLVMHello-.patch
-%endif
-
+Patch1:         0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
+Patch2:          0003-PATCH-clang-Don-t-install-static-libraries.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -104,6 +101,20 @@ This package contains header files for the Clang compiler.
 Clang コンパイラのヘッダファイル集です.
 
 
+%package static
+Summary:        static libraries for clang
+Summary(ja):    Clang の静的ライブラリ
+Group:          programming
+Requires:       clang-devel = %{version}-%{release}
+Requires:       clang = %{version}-%{release}
+
+%description static
+This package contains static libraries for the Clang compiler.
+
+%description devel -l ja
+Clang コンパイラの静的ライブラリです.
+
+
 %package analyzer
 Summary:        A source code analysis framework
 Summary(ja):    ソースコード分析フレームワーク
@@ -155,7 +166,6 @@ pathfix%{python3_version}.py -i %{__python3} -pn \
 	clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 
 %setup -q -n clang-%{version}.src
-%autopatch -M200 -p2
 
 # failing test case
 rm test/CodeGen/profile-filter.c
@@ -177,11 +187,7 @@ sed -i -e 's/"x86_64-linux-gnu",/"x86_64-linux-gnu","x86_64-vine-linux","x86_64-
 
 
 %build
-# lto builds with gcc 11 fail while running the lit tests.
-%define _lto_cflags %{nil}
-
-%ifarch s390 s390x %{arm} %ix86
-# Decrease debuginfo verbosity to reduce memory consumption during final library linking
+%if %reduce_debuginfo == 1
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
@@ -193,7 +199,7 @@ sed -i -e 's/"x86_64-linux-gnu",/"x86_64-linux-gnu","x86_64-vine-linux","x86_64-
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DPYTHON_EXECUTABLE=%{__python3} \
     -DCMAKE_SKIP_RPATH:BOOL=ON \
-%ifarch %ix86
+%if %reduce_debuginfo == 1
     -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
     -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %endif
@@ -203,31 +209,32 @@ sed -i -e 's/"x86_64-linux-gnu",/"x86_64-linux-gnu","x86_64-vine-linux","x86_64-
 %else
     -DLLVM_LIBDIR_SUFFIX= \
 %endif
-    -DCLANG_INCLUDE_TESTS:BOOL=OFF \
     -DLLVM_BUILD_UTILS:BOOL=ON \
     -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../clang-tools-extra-%{version}.src \
     -DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
     \
     -DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \
     -DLLVM_COMMON_CMAKE_UTILS=%{_datadir}/llvm/cmake \
-    -DCLANG_ENABLE_ARCMT:BOOL=ON \
-    -DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
-    -DCLANG_INCLUDE_DOCS:BOOL=ON \
-    -DCLANG_PLUGIN_SUPPORT:BOOL=OFF \
-    -DLLVM_ENABLE_PLUGINS:BOOL=OFF \
-    -DENABLE_LINKER_BUILD_ID:BOOL=ON \
+    \
+    -DBUILD_SHARED_LIBS=OFF \
     -DLLVM_ENABLE_EH=ON \
     -DLLVM_ENABLE_RTTI=ON \
-    -DLLVM_BUILD_DOCS=ON \
     -DLLVM_ENABLE_SPHINX=OFF \
-    -DLLVM_INCLUDE_TESTS:BOOL=OFF \
-    -DCLANG_LINK_CLANG_DYLIB=ON \
-    \
-    -DCLANG_LINK_CLANG_DYLIB=ON \
+    -DLLVM_INCLUDE_TESTS=OFF \
+    -DENABLE_LINKER_BUILD_ID:BOOL=ON \
     -DCLANG_BUILD_EXAMPLES:BOOL=OFF \
-    -DBUILD_SHARED_LIBS=OFF \
+    -DCLANG_CONFIG_FILE_SYSTEM_DIR=%{_sysconfdir}/clang/ \
+    -DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
+    -DCLANG_DEFAULT_UNWINDLIB=libgcc \
+    -DCLANG_ENABLE_ARCMT:BOOL=ON \
+    -DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \
+    -DCLANG_INCLUDE_DOCS:BOOL=ON \
+    -DCLANG_INCLUDE_TESTS:BOOL=OFF \
+    -DCLANG_LINK_CLANG_DYLIB=ON \
+    -DCLANG_PLUGIN_SUPPORT:BOOL=ON \
     -DCLANG_REPOSITORY_STRING="Vine Linux %{version}-%{release}" \
-    -DCLANG_DEFAULT_UNWINDLIB=libgcc
+    -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../clang-tools-extra-%{version}.src \
+    %{nil}
 
 %cmake_build
 
@@ -237,9 +244,6 @@ rm -rf %{buildroot}
 
 %cmake_install
 
-# remove static libraries
-rm -fv %{buildroot}%{_libdir}/libclang*.a
-
 # Add clang++-{version} symlink
 ln -s clang++ %{buildroot}%{_bindir}/clang++-%{ver_suffix}
 
@@ -248,15 +252,14 @@ mkdir -p %{buildroot}%{python3_sitelib}/clang/
 install -p -m644 bindings/python/clang/* %{buildroot}%{python3_sitelib}/clang/
 
 # install scanbuild-py to python sitelib.
-mv %{buildroot}%{_libdir}/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
+mv %{buildroot}%{_prefix}/lib/{libear,libscanbuild} %{buildroot}%{python3_sitelib}
 
 mv -v %{buildroot}%{_includedir}/clang/Config/config{,-%{__isa_bits}}.h
 install -m 0644 %{SOURCE11} %{buildroot}%{_includedir}/clang/Config/config.h
 
 # TODO: Package html docs
 rm -Rvf %{buildroot}%{_docdir}/clang/html
-rm -Rvf %{buildroot}%{_datadir}/clang/clang-doc-default-stylesheet.css
-rm -Rvf %{buildroot}%{_datadir}/clang/index.js
+rm -Rvf %{buildroot}%{_datadir}/clang-doc
 
 # remove git integration
 rm -vf %{buildroot}%{_bindir}/git-clang-format
@@ -286,12 +289,7 @@ rm -Rvf %{buildroot}%{_includedir}/clang-tidy/
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 #doc %{llvmdocdir clang}/
 %{_bindir}/clang
 %{_bindir}/clang++
@@ -301,13 +299,11 @@ rm -rf %{buildroot}
 %{_bindir}/clang-cpp
 
 %files libs
-%defattr(-,root,root,-)
 %{_libdir}/clang
 %{_libdir}/libclang.so.*
 %{_libdir}/libclang-cpp.so.*
 
 %files devel
-%defattr(-,root,root,-)
 #doc %{llvmdocdir clang-devel}/
 %{_libdir}/libclang.so
 %{_libdir}/libclang-cpp.so
@@ -316,8 +312,11 @@ rm -rf %{buildroot}
 %dir %{_datadir}/clang/
 %{_libdir}/cmake/*
 
+%files static
+%{_libdir}/libclang*.a
+%{_libdir}/libfindAllSymbols.a
+
 %files analyzer
-%defattr(-,root,root,-)
 %{_bindir}/analyze-build
 %{_bindir}/intercept-build
 %{_bindir}/scan-build
@@ -360,6 +359,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Nov 14 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.1.3-1
+- new upstream release.
+
 * Sat May 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 18.1.5-1
 - new upstream release.
 

+ 14 - 5
c/compiler-rt/compiler-rt-vl.spec

@@ -1,5 +1,15 @@
 %bcond_with test
 
+%ifarch %ix86
+%bcond_with lto_build
+%else
+%bcond_without lto_build
+%endif
+
+%if %{without lto_build}
+%global _lto_cflags %{nil}
+%endif
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %define ver_suffix %(echo "%{version}" | cut -d . -f 1)
@@ -15,7 +25,7 @@
 Summary:        LLVM "compiler-rt" runtime libraries
 Summary(ja):    LLVM "compiler-rt" ランタイムライブラリ
 Name:           compiler-rt
-Version:        18.1.5
+Version:        19.1.3
 %define         shortver %(echo %{version} | cut -d. -f1)
 Release:        1%{?_dist_release}
 Group:          programming
@@ -96,10 +106,6 @@ export ASMFLAGS=$CFLAGS
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
 %license LICENSE.TXT
 %ifarch x86_64 aarch64
@@ -111,6 +117,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.1.3-1
+- new upstream release.
+
 * Sat May 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 18.1.5-1
 - new upstream release.
 

+ 18 - 13
l/lld/lld-vl.spec

@@ -1,6 +1,16 @@
 %bcond_without lld_libs
 %bcond_with test
 
+%ifarch %ix86
+%bcond_with lto_build
+%else
+%bcond_without lto_build
+%endif
+
+%if %{without lto_build}
+%global _lto_cflags %{nil}
+%endif
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %define ver_suffix %(echo "%{version}" | cut -d . -f 1)
@@ -9,7 +19,7 @@
 Summary:        The LLVM Linker
 Summary(ja):    LLVMリンカー
 Name:           lld
-Version:        18.1.5
+Version:        19.1.3
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -18,11 +28,12 @@ Distribution:   Vine Linux
 License:        NCSA
 URL:            https://llvm.org/
 Source0:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/lld-%{version}.src.tar.xz
+Source100:      https://raw.githubusercontent.com/llvm/llvm-project/refs/heads/main/libunwind/include/mach-o/compact_unwind_encoding.h#/compact_unwind_encoding.h-%{version}
 
 # patches
 
 # Bundle libunwind header need during build for MachO support
-Patch2:         0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch
+Patch2:         0001-Always-build-shared-libs-for-LLD.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -68,16 +79,12 @@ programs that use the LLD infrastructure.
 
 
 %prep
-#%setup -T -q -b 1 -n cmake-%{version}.src
-#cd ..
-#mv cmake-%{version}.src cmake
-
 %autosetup -p2 -n lld-%{version}.src 
 
+install -Dpm644 %{SOURCE100} ./include/mach-o/compact_unwind_encoding.h
+
 
 %build
-# Disable lto since it causes the COFF/libpath.test lit test to crash.
-%global _lto_cflags %{nil}
 
 %cmake \
         -GNinja \
@@ -132,10 +139,6 @@ touch %{buildroot}%{_bindir}/ld
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
   /sbin/alternatives --install /usr/bin/ld ld \
   /usr/bin/ld.lld 20
@@ -147,7 +150,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/lld*
 %{_bindir}/ld.lld
 %{_bindir}/ld64.lld
@@ -166,6 +168,9 @@ fi
 
 
 %changelog
+* Fri Nov 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.1.3-1
+- new upstream release.
+
 * Sat May 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 18.1.5-1
 - new upstream release.
 

+ 16 - 2
l/lldb/lldb-vl.spec

@@ -1,5 +1,15 @@
 %bcond_with test
 
+%ifarch %ix86
+%bcond_with lto_build
+%else
+%bcond_without lto_build
+%endif
+
+%if %{without lto_build}
+%global _lto_cflags %{nil}
+%endif
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %define ver_suffix %(echo "%{version}" | cut -d . -f 1)
@@ -7,7 +17,7 @@
 Summary:        Next generation high-performance debugger
 Summary(ja):    高性能デバッガー
 Name:           lldb
-Version:        18.1.5
+Version:        19.1.3
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -27,11 +37,12 @@ BuildRequires:  ninja
 BuildRequires:  llvm-devel = %{version}
 BuildRequires:  llvm-static = %{version}
 BuildRequires:  clang-devel = %{version}
+BuildRequires:  clang-static = %{version}
 BuildRequires:  clang-tools-extra = %{version}
 BuildRequires:  ncurses-devel
 BuildRequires:  swig
 BuildRequires:  libffi-devel >= 3.3
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(zlib)
 BuildRequires:  libxml2-devel
 BuildRequires:  libedit-devel
 BuildRequires:  python3-devel
@@ -148,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.1.3-1
+- new upstream release.
+
 * Sat May 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 18.1.5-1
 - new upstream release.
 

+ 28 - 26
l/llvm/llvm-vl.spec

@@ -1,5 +1,15 @@
 %bcond_with test
 
+%ifarch %ix86
+%bcond_with lto_build
+%else
+%bcond_without lto_build
+%endif
+
+%if %{without lto_build}
+%global _lto_cflags %{nil}
+%endif
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %define ver_suffix %(echo "%{version}" | cut -d . -f 1)
@@ -28,7 +38,7 @@
 Summary:        The Low Level Virtual Machine
 Summary(ja):    LLVM - 低レベルバーチャルマシン
 Name:           llvm
-Version:        18.1.5
+Version:        19.1.3
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -42,10 +52,6 @@ Source2:        https://github.com/llvm/llvm-project/releases/download/llvmorg-%
 # multilib fixes
 Source10:        llvm-config.h
 
-# patches
-# RHEL-specific patch to avoid unwanted recommonmark dep
-Patch101:	0101-Deactivate-markdown-doc.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  binutils-devel
@@ -57,7 +63,7 @@ BuildRequires:  ninja
 BuildRequires:  python3-devel
 BuildRequires:  python3-rpm-macros
 BuildRequires:  valgrind-devel
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(zlib)
 
 Requires:       llvm-libs-extras = %{version}-%{release}
 
@@ -100,6 +106,7 @@ Summary:        LLVM shared libraries
 Summary(ja):    LLVM 共有ライブラリ
 Group:          system
 Obsoletes:      llvm-libs < 15.0.0
+Obsoletes:      llvm17-libs < 18.0.0
 Obsoletes:      llvm16-libs < 17.0.0
 Obsoletes:      llvm15-libs < 16.0.0
 Obsoletes:      llvm14-libs < 15.0.0
@@ -146,15 +153,16 @@ Shared libraries for the LLVM compiler infrastructure.
 %prep
 %setup -q -T -b 1 -n cmake-%{version}.src
 cd ..
+rm -rf cmake
 mv -f cmake-%{version}.src cmake
 
 %setup -q -T -b 2 -n third-party-%{version}.src
-%autopatch -p2 -m200
 cd ..
+rm -rf third-party
 mv -f third-party-%{version}.src third-party
 
 %setup -q -T -b 0 -n llvm-%{version}.src
-%autopatch -p2 -M199
+%autopatch -p2
 
 pathfix%{python3_version}.py -i %{__python3} -pn \
 	test/BugPoint/compile-custom.ll.py \
@@ -163,8 +171,6 @@ pathfix%{python3_version}.py -i %{__python3} -pn \
 
 
 %build
-%global _lto_cflags %{nil}
-
 %ifarch s390 s390x %{arm} %ix86 x86_64
 # Decrease debuginfo verbosity to reduce memory consumption during final library linking
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
@@ -202,8 +208,8 @@ export ASMFLAGS="%{build_cflags}"
         -DLLVM_INCLUDE_TOOLS:BOOL=ON \
         -DLLVM_BUILD_TOOLS:BOOL=ON \
         \
-        -DLLVM_INCLUDE_TESTS:BOOL=ON \
-        -DLLVM_BUILD_TESTS:BOOL=ON \
+        -DLLVM_INCLUDE_TESTS:BOOL=OFF \
+        -DLLVM_BUILD_TESTS:BOOL=OFF \
         -DLLVM_LIT_ARGS=-v \
         \
         -DLLVM_INCLUDE_EXAMPLES:BOOL=ON \
@@ -233,7 +239,7 @@ export ASMFLAGS="%{build_cflags}"
         \
         -DLLVM_INCLUDE_BENCHMARKS=OFF \
 %if %{with lto_build}
-        -DLLVM_UNITTEST_LINK_FLAGS="-Wl,-plugin-opt=O0" \
+        -DLLVM_UNITTEST_LINK_FLAGS="-fno-lto" \
 %endif
 %ifarch x86_64
         -DCMAKE_SHARED_LINKER_FLAGS="$LDFLAGS -Wl,-z,cet-report=error"
@@ -272,10 +278,6 @@ ninja -C build check
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %posttrans devel
 # link llvm-config to the platform-specific file;
 # use ISA bits as priority so that 64-bit is preferred
@@ -296,7 +298,6 @@ exit 0
 
 
 %files
-%defattr(-,root,root,-)
 %license LICENSE.TXT
 %doc CREDITS.TXT README.txt
 %{_bindir}/*
@@ -306,22 +307,22 @@ exit 0
 %{_datadir}/opt-viewer
 
 %files -n llvm%{ver_suffix}-libs
-%defattr(-,root,root,-)
 %license LICENSE.TXT
 %{_libdir}/libLLVM.so.*
 %{_libdir}/libLLVM-*.so
-%{_libdir}/libLTO.so*
-%{_libdir}/libRemarks.so*
-%{_libdir}/LLVMgold.so
-%{_libdir}/bfd-plugins/LLVMgold.so
+%{_libdir}/libLTO.so.*
+%{_libdir}/libRemarks.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/llvm-config
 %{_bindir}/llvm-config-%{__isa_bits}
 %{_includedir}/%{name}
 %{_includedir}/%{name}-c
 %{_libdir}/libLLVM.so
+%{_libdir}/libLTO.so
+%{_libdir}/libRemarks.so
+%{_libdir}/LLVMgold.so
+%{_libdir}/bfd-plugins/LLVMgold.so
 %{_libdir}/cmake/llvm
 %dir %{_datadir}/llvm
 %{_datadir}/llvm/cmake
@@ -330,12 +331,10 @@ exit 0
 %{_libdir}/*.a
 
 %files doc
-%defattr(-,root,root,-)
 %doc docs/*
 
 %if %{build_compat32}
 %files -n compat32-%{name}%{ver_suffix}-libs
-%defattr(-,root,root)
 %license LICENSE.TXT
 %{_libdir}/libLLVM.so.*
 %{_libdir}/libLLVM-*.so
@@ -344,6 +343,9 @@ exit 0
 
 
 %changelog
+* Thu Nov 14 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.1.3-1
+- new upstream release.
+
 * Sat May 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 18.1.5-1
 - new upstream release.
 

+ 9 - 13
lib/libo/libomp/libomp-vl.spec

@@ -1,5 +1,7 @@
 %bcond_with test
 
+%global _lto_cflags %{nil}
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define ver_suffix %(echo "%{version}" | cut -d . -f 1)
 %define _unpackaged_files_terminate_build 1
@@ -7,7 +9,7 @@
 Summary:        OpenMP runtime for clang
 Summary(ja):    clang用OpenMPランタイム
 Name:           libomp
-Version:        18.1.5
+Version:        19.1.3
 %define         shortver %(echo %{version} | cut -d. -f1)
 Release:        1%{?_dist_release}
 Group:          system
@@ -56,9 +58,6 @@ The package contains the OpenMP header files.
 
 
 %build
-# LTO causes build failures in this package.  Disable LTO for now
-%define _lto_cflags %{nil}
-
 %cmake \
         -GNinja \
         -DLIBOMP_INSTALL_ALIASES=OFF \
@@ -91,31 +90,25 @@ rm -f %{buildroot}%{_libdir}/libarcher_static.a
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
 %license LICENSE.TXT
 %{_libdir}/libarcher.so
 %{_libdir}/libomp.so
 %{_libdir}/libompd.so
-%ifnarch %{ix86} %{arm}
+%if 0
 %{_libdir}/libomptarget.so.*
 %{_libdir}/libomptarget.rtl.*.so*
 %endif
 
 %files devel
-%ifnarch %{ix86} %{arm}
-%{_libdir}/libomptarget.devicertl.a
-%endif
 %{_libdir}/clang/%{shortver}/include/omp.h
 %{_libdir}/clang/%{shortver}/include/ompx.h
 %{_libdir}/clang/%{shortver}/include/omp-tools.h
 %{_libdir}/clang/%{shortver}/include/ompt.h
 %{_libdir}/clang/%{shortver}/include/ompt-multiplex.h
 %{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
-%ifnarch %{ix86} %{arm}
+%if 0
+%{_libdir}/libomptarget.devicertl.a
 %{_libdir}/libomptarget.so
 %{_libdir}/libomptarget.rtl.*.so
 %{_libdir}/libomptarget-*.bc
@@ -123,6 +116,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.1.3-1
+- new upstream release.
+
 * Sat May 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 18.1.5-1
 - new upstream release.
 

+ 8 - 8
v/vine-rpm-macros/vine-rpm-macros-vl.spec

@@ -1,7 +1,7 @@
 Summary:        rpm macros for Vine Linux
 Summary(ja):    Vine Linux用rpmマクロ
 Name:           vine-rpm-macros
-Version:        9
+Version:        10
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -13,6 +13,7 @@ Source1:        macros.vine
 Source2:        macros.dwz
 Source3:        macros.ldconfig
 Source4:        macros.vpath
+Source5:        brp-strip-lto
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
@@ -54,28 +55,27 @@ This package contains rpm macros to build packages for Vine Linux.
 %install
 %{__rm} -rf %{buildroot}
 install -Dpm644 %{SOURCE0} %{buildroot}/usr/lib/rpm/vine/rpmrc
-install -Dpm644 %{SOURCE1} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
+install -Dpm644 %{SOURCE1} %{buildroot}/usr/lib/rpm/vine/macros
 install -Dpm644 %{SOURCE2} %{buildroot}/usr/lib/rpm/macros.d/macros.dwz
 install -Dpm644 %{SOURCE3} %{buildroot}/usr/lib/rpm/macros.d/macros.ldconfig
 install -Dpm644 %{SOURCE4} %{buildroot}/usr/lib/rpm/macros.d/macros.vpath
-
-
-%clean
-%{__rm} -rf %{buildroot}
+install -Dpm755 %{SOURCE5} %{buildroot}/usr/lib/rpm/brp-strip-lto
 
 
 %files
-%defattr(-,root,root)
+/usr/lib/rpm/brp-strip-lto
 /usr/lib/rpm/vine/*
 /usr/lib/rpm/macros.d/*
 
 %files -n vine-rpm-build-macros
-%defattr(-,root,root)
 #{_fileattrsdir}/*
 #{_rpmconfigdir}/metainfo.prov
 
 
 %changelog
+* Thu Nov 14 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10-1
+- added brp-strip-lto and macros.
+
 * Tue Jul 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9-1
 - enabled LTO.
 - added macros.{ldconfig,vpath}.