Hello community, here is the log from the commit of package xorg-cf-files for openSUSE:Factory checked in at 2018-03-04 11:52:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-cf-files (Old) and /work/SRC/openSUSE:Factory/.xorg-cf-files.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-cf-files" Sun Mar 4 11:52:28 2018 rev:11 rq:581006 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-cf-files/xorg-cf-files.changes 2016-01-05 09:40:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-cf-files.new/xorg-cf-files.changes 2018-03-04 11:52:31.410316786 +0100 @@ -1,0 +2,5 @@ +Tue Feb 27 13:11:08 UTC 2018 - [email protected] + +- u_riscv.patch: Add support for riscv64 + +------------------------------------------------------------------- New: ---- u_riscv.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-cf-files.spec ++++++ --- /var/tmp/diff_new_pack.ZY6GaR/_old 2018-03-04 11:52:31.866300374 +0100 +++ /var/tmp/diff_new_pack.ZY6GaR/_new 2018-03-04 11:52:31.870300230 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-cf-files # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ Group: Development/Tools/Building Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2 +Patch0: u_riscv.patch BuildRequires: font-util >= 1.1 BuildRequires: pkgconfig(xorg-macros) >= 1.4 Requires: gccmakedep @@ -51,13 +52,14 @@ %prep %setup -q +%patch0 -p1 cat > host.def << EOF #define ConfigDir %_configdir #define XAppLoadDir /usr/share/X11/app-defaults #define UseSeparateConfDir NO #define ManPath /usr/share/man -%ifarch ppc64 s390x x86_64 sparc64 +%ifarch ppc64 s390x x86_64 sparc64 riscv64 #define ModuleDir /usr/lib64/xorg/modules %else #define ModuleDir /usr/lib/xorg/modules @@ -104,6 +106,10 @@ # define HaveLib64 NO #endif #endif +#ifdef RiscV64Architecture +#undef DefaultGcc2RiscV64Opt +#define DefaultGcc2RiscV64Opt $RPM_OPT_FLAGS -fno-strict-aliasing +#endif EOF %build ++++++ u_riscv.patch ++++++ Author: Andreas Schwab <[email protected]> Subject: Add support for riscv64 Patch-Mainline: To be upstreamed Index: xorg-cf-files-1.0.6/Imake.cf =================================================================== --- xorg-cf-files-1.0.6.orig/Imake.cf +++ xorg-cf-files-1.0.6/Imake.cf @@ -1037,6 +1037,11 @@ XCOMM Keep cpp from replacing path eleme # define AArch64Architecture # undef __aarch64__ # endif +# if defined(__riscv) && __riscv_xlen == 64 +# define RiscV64Architecture +# undef __riscv +# undef __riscv_xlen +# endif #endif /* linux || __GLIBC__ */ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) Index: xorg-cf-files-1.0.6/linux.cf =================================================================== --- xorg-cf-files-1.0.6.orig/linux.cf +++ xorg-cf-files-1.0.6/linux.cf @@ -578,7 +578,7 @@ InstallNamedTargetNoClobber(install,file #define MkdirHierCmd mkdir -p #ifndef HaveLib64 -# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) +# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined(RiscV64Architecture) # define HaveLib64 YES # else # define HaveLib64 NO @@ -994,6 +994,15 @@ InstallNamedTargetNoClobber(install,file # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AArch64Architecture */ +#ifdef RiscV64Architecture +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags DefaultGcc2RiscV64Opt +# endif +# define LinuxMachineDefines -D__riscv -D__riscv_xlen=64 +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +#endif /* RiscV64Architecture */ + #ifndef StandardDefines # ifdef __linux__ # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines Index: xorg-cf-files-1.0.6/xfree86.cf =================================================================== --- xorg-cf-files-1.0.6.orig/xfree86.cf +++ xorg-cf-files-1.0.6/xfree86.cf @@ -2052,6 +2052,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane # endif #endif +#if HasGcc2 && defined(RiscV64Architecture) +# ifndef DefaultGcc2RiscV64Opt +# define DefaultGcc2RiscV64Opt -O2 GccAliasingArgs +# endif +#endif + #ifndef DefaultGcc2DebugOpt # define DefaultGcc2DebugOpt -g #endif Index: xorg-cf-files-1.0.6/xorg.cf =================================================================== --- xorg-cf-files-1.0.6.orig/xorg.cf +++ xorg-cf-files-1.0.6/xorg.cf @@ -1603,6 +1603,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane # endif #endif +#if HasGcc2 && defined(RiscV64Architecture) +# ifndef DefaultGcc2RiscV64Opt +# define DefaultGcc2RiscV64Opt -O2 GccAliasingArgs +# endif +#endif + #ifndef DefaultGcc2DebugOpt # define DefaultGcc2DebugOpt -g #endif
