Compare commits

..

No commits in common. "1c518e5ca81735f5479cee5e01b9de7bf4eb94d5" and "4a34b6d202df6875452cb53f85926cb4b78e1d3f" have entirely different histories.

3 changed files with 3 additions and 63 deletions

View File

@ -1,26 +0,0 @@
diff --git a/src/util/build_config.h b/src/util/build_config.h
index 717b4e3..438777e 100644
--- a/src/util/build_config.h
+++ b/src/util/build_config.h
@@ -164,6 +164,21 @@
#define ARCH_CPU_32_BITS 1
#define ARCH_CPU_BIG_ENDIAN 1
#endif
+#elif defined(__loongarch32)
+#define ARCH_CPU_LOONG_FAMILY 1
+#define ARCH_CPU_LOONG32 1
+#define ARCH_CPU_32_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
+#elif defined(__loongarch64)
+#define ARCH_CPU_LOONG_FAMILY 1
+#define ARCH_CPU_LOONG64 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
+#elif defined(__riscv) && (__riscv_xlen == 64)
+#define ARCH_CPU_RISCV_FAMILY 1
+#define ARCH_CPU_RISCV64 1
+#define ARCH_CPU_64_BITS 1
+#define ARCH_CPU_LITTLE_ENDIAN 1
#else
#error Please add support for your architecture in build_config.h
#endif

View File

@ -1,18 +0,0 @@
From: "xuchogyu" <xuchongyu@huawei.com>
Date: Tue, 7 Mar 2023 09:52:37 +0800
Subject: [PATCH] Add safe compilation option -fPIE for GN
---
diff -Nur a/build/gen.py b/build/gen.py
--- a/build/gen.py 2022-11-25 10:58:41.000000000 +0800
+++ b/build/gen.py 2023-03-06 09:49:35.648580670 +0800
@@ -371,7 +371,8 @@
'-Wall',
'-Wextra',
'-Wno-unused-parameter',
- '-std=c++17'
+ '-std=c++17',
+ '-fPIE'
])
if platform.is_linux() or platform.is_mingw() or platform.is_msys():

22
gn.spec
View File

@ -2,15 +2,13 @@
Name: gn
Version: 1.0.0
Release: 5
Release: 1
Summary: Meta-build system that generates build files for Ninja
License: BSD-3-Clause
URL: https://gn.googlesource.com/gn
Source0: %{url}/+archive/gn-%{commit}.tar.gz
Source1: last_commit_position.h
Patch0000: gn-always-python3.patch
Patch0001: add_safe_compilation_options.patch
Patch1000: add-risc-v-and-loongarch-support.patch
Patch0: gn-always-python3.patch
BuildRequires: python3-devel ninja-build gcc-c++ clang emacs-common help2man
@ -73,10 +71,10 @@ find '%{buildroot}%{_datadir}/vim/vimfiles' \
install -t '%{buildroot}%{_emacs_sitestartdir}' -D -p -m 0644 misc/emacs/*.el
install -t '%{buildroot}%{_mandir}/man1' -D -m 0644 -p out/gn.1
rm -rf %{buildroot}%{_datadir}/vim/vimfiles/__pycache__
%check
out/gn_unittests
rm -rf %{buildroot}%{_datadir}/vim/vimfiles/__pycache__
%files
@ -89,8 +87,6 @@ rm -rf %{buildroot}%{_datadir}/vim/vimfiles/__pycache__
%{_datadir}/vim/vimfiles/ftplugin/gn.vim
%{_datadir}/vim/vimfiles/syntax/gn.vim
%{_emacs_sitestartdir}/gn-mode.el
%exclude %{_datadir}/vim/vimfiles/__pycache__
%files doc
%license LICENSE src/base/third_party/icu/README.chromium
@ -104,17 +100,5 @@ rm -rf %{buildroot}%{_datadir}/vim/vimfiles/__pycache__
%changelog
* Fri Dec 22 2023 misaka00251 <liuxin@iscas.ac.cn> - 1.0.0-5
- Enable debuginfo for riscv64
* Sat Aug 19 2023 senlin <xiasenlin1@huawei.com> - 1.0.0-4
- exclude no need .pyc files
* Mon Mar 13 2023 misaka00251 <liuxin@iscas.ac.cn> - 1.0.0-3
- Add risc-v and loongarch support
* Tue Mar 07 2023 xuchongyu <xuchongyu@huawei.com> 1.0.0-2
- Add safe compilation options
* Tue Nov 29 2022 xuchongyu <xuchongyu@huawei.com> 1.0.0-1
- init