From 0a9505a2b6a4d4cad27f45d4336e055d67c8e671 Mon Sep 17 00:00:00 2001 From: guibuilder_pel7ppc64lebuilder0 Date: Sat, 16 May 2020 01:07:05 +0200 Subject: [PATCH] imake package update Signed-off-by: guibuilder_pel7ppc64lebuilder0 --- SOURCES/imake-1.0.2-aarch64-fixup.patch | 26 +++ SOURCES/imake-1.0.2-abort.patch | 18 ++ SOURCES/imake-add-aarch64.patch | 89 ++++++++ SOURCES/xorg-cf-files-1.0.2-redhat.patch | 17 ++ SPECS/imake.spec | 269 +++++++++++++++++++++++ 5 files changed, 419 insertions(+) create mode 100644 SOURCES/imake-1.0.2-aarch64-fixup.patch create mode 100644 SOURCES/imake-1.0.2-abort.patch create mode 100644 SOURCES/imake-add-aarch64.patch create mode 100644 SOURCES/xorg-cf-files-1.0.2-redhat.patch create mode 100644 SPECS/imake.spec diff --git a/SOURCES/imake-1.0.2-aarch64-fixup.patch b/SOURCES/imake-1.0.2-aarch64-fixup.patch new file mode 100644 index 0000000..efd92ee --- /dev/null +++ b/SOURCES/imake-1.0.2-aarch64-fixup.patch @@ -0,0 +1,26 @@ +From 2d586d8c0fe5190a6ab0958ee586e9a8c0a02d72 Mon Sep 17 00:00:00 2001 +From: Riku Voipio +Date: Fri, 06 Dec 2013 23:37:36 +0000 +Subject: add DefaultGcc2AArch64Opt to xorg.cf + +Signed-off-by: Alan Coopersmith +--- +diff --git a/xorg.cf b/xorg.cf +index 81e78df..8ea5715 100644 +--- a/xorg.cf ++++ b/xorg.cf +@@ -1561,6 +1561,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese + # endif + #endif + ++#if HasGcc2 && defined(AArch64Architecture) ++# ifndef DefaultGcc2AArch64Opt ++# define DefaultGcc2AArch64Opt -O2 GccAliasingArgs ++# endif ++#endif ++ + #if HasGcc2 && defined(AMD64Architecture) + # ifndef DefaultGcc2AMD64Opt + # define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/imake-1.0.2-abort.patch b/SOURCES/imake-1.0.2-abort.patch new file mode 100644 index 0000000..49ffdce --- /dev/null +++ b/SOURCES/imake-1.0.2-abort.patch @@ -0,0 +1,18 @@ +diff -up imake-1.0.2/imake.c.jx imake-1.0.2/imake.c +--- imake-1.0.2/imake.c.jx 2006-05-15 16:28:14.000000000 -0400 ++++ imake-1.0.2/imake.c 2010-10-25 17:14:37.000000000 -0400 +@@ -1030,8 +1030,12 @@ get_libc_version(FILE *inFile) + + len = pclose (fp); + remove (aout); +- if (len) +- abort (); ++ if (len) { ++ /* handwave furiously */ ++ printf("#define DefaultLinuxCLibMajorVersion 6\n"); ++ printf("#define DefaultLinuxCLibMinorVersion 12\n"); ++ printf("#define DefaultLinuxCLibTeenyVersion 0\n"); ++ } + } + #endif + diff --git a/SOURCES/imake-add-aarch64.patch b/SOURCES/imake-add-aarch64.patch new file mode 100644 index 0000000..06f0bdd --- /dev/null +++ b/SOURCES/imake-add-aarch64.patch @@ -0,0 +1,89 @@ +From f4d87258b453da006ca6126ccaaf4acd1be7da1c Mon Sep 17 00:00:00 2001 +From: Riku Voipio +Date: Mon, 22 Apr 2013 11:24:13 +0000 +Subject: [PATCH] Add Aarch64 support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch is based on follow patch by Dirk Müller : + +https://build.opensuse.org/package/view_file?expand=1&file=aarch64-support.diff&package=xorg-cf-files&project=devel%3AARM%3AAArch64%3A12.3 + +Signed-off-by: Alan Coopersmith + +Edited-by: Marcin Juszkiewicz + +Changed OptimizedCDebugFlags define to contain real gcc flags as +DefaultGcc2AArch64Opt was not defined during builds. + +--- + Imake.cf | 4 ++++ + linux.cf | 11 ++++++++++- + xfree86.cf | 6 ++++++ + 3 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/Imake.cf b/Imake.cf +index d8a58e2..1ff3c8c 100644 +--- a/Imake.cf ++++ b/Imake.cf +@@ -1022,6 +1022,10 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 + # define AMD64Architecture + # endif + # endif ++# if defined(__aarch64__) ++# define AArch64Architecture ++# undef __aarch64__ ++# endif + #endif /* linux || __GLIBC__ */ + + #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) +diff --git a/linux.cf b/linux.cf +index 59fbbe9..716821e 100644 +--- a/linux.cf ++++ b/linux.cf +@@ -584,7 +584,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class + #define MkdirHierCmd mkdir -p + + #ifndef HaveLib64 +-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) ++# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) + # define HaveLib64 YES + # else + # define HaveLib64 NO +@@ -982,6 +982,15 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class + # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 + #endif /* AMD64Architecture */ + ++#ifdef AArch64Architecture ++# ifndef OptimizedCDebugFlags ++# define OptimizedCDebugFlags -O2 GccAliasingArgs ++# endif ++# define LinuxMachineDefines -D__aarch64__ ++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME ++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* AArch64Architecture */ ++ + #ifndef StandardDefines + # ifdef __linux__ + # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines +diff --git a/xfree86.cf b/xfree86.cf +index f7c151c..0f538e0 100644 +--- a/xfree86.cf ++++ b/xfree86.cf +@@ -2022,6 +2022,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese + # endif + #endif + ++#if HasGcc2 && defined(AArch64Architecture) ++# ifndef DefaultGcc2AArch64Opt ++# define DefaultGcc2AArch64Opt -O2 GccAliasingArgs ++# endif ++#endif ++ + #if HasGcc2 && defined(AlphaArchitecture) + # ifndef DefaultGcc2AxpOpt + # define DefaultGcc2AxpOpt -O2 GccAliasingArgs +-- +1.8.3.1 + diff --git a/SOURCES/xorg-cf-files-1.0.2-redhat.patch b/SOURCES/xorg-cf-files-1.0.2-redhat.patch new file mode 100644 index 0000000..bab1467 --- /dev/null +++ b/SOURCES/xorg-cf-files-1.0.2-redhat.patch @@ -0,0 +1,17 @@ +--- xorg-cf-files-1.0.4/linux.cf.redhat 2005-10-21 21:10:27.000000000 +0200 ++++ xorg-cf-files-1.0.4/linux.cf 2005-12-21 11:27:16.000000000 +0100 +@@ -190,7 +190,13 @@ + #endif /* LinuxDebian */ + + #if LinuxDistribution == LinuxRedHat +-#define FSUseSyslog YES ++# define FSUseSyslog YES ++# define BuildRman NO ++# define BuildHtmlManPages NO ++# define ProjectRoot /usr ++# define ManPath /usr/share/man ++# define XAppLoadDir /usr/share/X11/app-defaults ++# define ConfigDir /usr/share/X11/config + #endif + + #ifndef HasDevRandom diff --git a/SPECS/imake.spec b/SPECS/imake.spec new file mode 100644 index 0000000..7449c5d --- /dev/null +++ b/SPECS/imake.spec @@ -0,0 +1,269 @@ +Summary: imake source code configuration and build system +Name: imake +Version: 1.0.5 +Release: 10%{?dist} +License: MIT +Group: User Interface/X +URL: http://www.x.org + +Source0: ftp://ftp.x.org/pub/individual/util/imake-1.0.5.tar.bz2 +Source1: ftp://ftp.x.org/pub/individual/util/makedepend-1.0.4.tar.bz2 +Source2: ftp://ftp.x.org/pub/individual/util/gccmakedep-1.0.2.tar.bz2 +Source3: ftp://ftp.x.org/pub/individual/util/xorg-cf-files-1.0.4.tar.bz2 +Source4: ftp://ftp.x.org/pub/individual/util/lndir-1.0.3.tar.bz2 +Patch2: xorg-cf-files-1.0.2-redhat.patch +Patch11: imake-1.0.2-abort.patch +Patch20: imake-add-aarch64.patch +Patch21: imake-1.0.2-aarch64-fixup.patch + +BuildRequires: pkgconfig +BuildRequires: xorg-x11-util-macros +BuildRequires: xorg-x11-proto-devel + +Provides: ccmakedep cleanlinks gccmakedep lndir makedepend makeg +Provides: mergelib mkdirhier mkhtmlindex revpath xmkmf + +%description +Imake is a deprecated source code configuration and build system which +has traditionally been supplied by and used to build the X Window System +in X11R6 and previous releases. As of the X Window System X11R7 release, +the X Window system has switched to using GNU autotools as the primary +build system, and the Imake system is now deprecated, and should not be +used by new software projects. Software developers are encouraged to +migrate software to the GNU autotools system. + +%prep +%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 +%patch2 -p0 -b .redhat + +# imake patches +pushd %{name}-%{version} +%patch11 -p1 -b .abort +popd +pushd xorg-cf-files-1.0.4 +%patch20 -p1 +%patch21 -p1 +popd + +%build +# Build everything +{ + for pkg in imake makedepend gccmakedep lndir xorg-cf-files ; do + pushd $pkg-* + case $pkg in + imake|xorg-cf-files) + %configure --with-config-dir=%{_datadir}/X11/config + ;; + *) + %configure + ;; + esac + make + popd + done +} + +%install +rm -rf $RPM_BUILD_ROOT + +# Install everything +{ + for pkg in imake makedepend gccmakedep lndir xorg-cf-files ; do + pushd $pkg-* + case $pkg in +# xorg-cf-files) +# make install DESTDIR=$RPM_BUILD_ROOT libdir=%%{_datadir} +# ;; + *) + make install DESTDIR=$RPM_BUILD_ROOT + ;; + esac + popd + done +} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc +%{_bindir}/ccmakedep +%{_bindir}/cleanlinks +%{_bindir}/gccmakedep +%{_bindir}/imake +%{_bindir}/lndir +%{_bindir}/makedepend +%{_bindir}/makeg +%{_bindir}/mergelib +%{_bindir}/mkdirhier +%{_bindir}/mkhtmlindex +%{_bindir}/revpath +%{_bindir}/xmkmf +%dir %{_datadir}/X11/config +%{_datadir}/X11/config/*.cf +%{_datadir}/X11/config/*.def +%{_datadir}/X11/config/*.rules +%{_datadir}/X11/config/*.tmpl +#%%dir %%{_mandir}/man1x +%{_mandir}/man1/ccmakedep.1* +%{_mandir}/man1/cleanlinks.1* +%{_mandir}/man1/gccmakedep.1* +%{_mandir}/man1/imake.1* +%{_mandir}/man1/lndir.1* +%{_mandir}/man1/makedepend.1* +%{_mandir}/man1/makeg.1* +%{_mandir}/man1/mergelib.1* +%{_mandir}/man1/mkdirhier.1* +%{_mandir}/man1/mkhtmlindex.1* +%{_mandir}/man1/revpath.1* +%{_mandir}/man1/xmkmf.1* + +%changelog +* Fri Jan 24 2014 Daniel Mach - 1.0.5-10 +- Mass rebuild 2014-01-24 + +* Thu Jan 23 2014 Dave Airlie 1.0.5-9 +- add aarch64 support (#1041342) + +* Fri Dec 27 2013 Daniel Mach - 1.0.5-8 +- Mass rebuild 2013-12-27 + +* Thu Feb 07 2013 Jon Ciesla 1.0.5-7 +- Merge review fixes, BZ 225898. + +* Thu Jan 03 2013 Adam Jackson 1.0.5-6 +- Drop unused patches + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 08 2012 Adam Jackson 1.0.5-4 +- imake 1.0.5 +- lndir 1.0.3 +- makedepend 1.0.4 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jan 06 2011 Adam Jackson 1.0.4-2 +- xorg-cf-files 1.0.4 +- xorg-cf-files-1.0.2-xprint.patch: Drop, merged. + +* Mon Nov 01 2010 Peter Hutterer 1.0.4-1 +- imake 1.0.4 +- makedepend 1.0.3 +- lndir 1.0.2 + +* Mon Oct 25 2010 Adam Jackson 1.0.2-15 +- imake-1.0.2-abort.patch: Paper over an abort (#646561) + +* Mon Oct 25 2010 Adam Jackson 1.0.2-14 +- Don't own things owned by filesystem (#569411) + +* Mon Feb 22 2010 Matěj Cepl - 1.0.2-13 +- lndir should ignore .git directory (RH BZ #538249) + +* Mon Oct 19 2009 Adam Jackson 1.0.2-12 +- xorg-cf-files 1.0.3.3.3 + +* Tue Oct 13 2009 Adam Jackson 1.0.2-11 +- makedepend 1.0.2 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 1.0.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Feb 08 2009 Adam Jackson 1.0.2-8 +- imake-1.0.2-find-pedantry.patch: Silence useless pedantry warning from + find(1) when running cleanlinks. (#483126) + +* Tue Jul 15 2008 Adam Jackson 1.0.2-7 +- Fix license tag. + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-6 +- Autorebuild for GCC 4.3 + +* Tue Aug 21 2007 Adam Jackson - 1.0.2-5 +- Rebuild for build id + +* Mon Mar 26 2007 Adam Jackson 1.0.2-4 +- makedepend 1.0.1 + +* Tue Jul 18 2006 Than Ngo 1.0.2-3 +- cleanup patch files +- update source files + +* Fri Jul 14 2006 Jesse Keating - 1.0.2-2 +- rebuild + +* Wed Jun 21 2006 Mike A. Harris 1.0.2-1 +- Update to imake-1.0.2, gccmakedep-1.0.2, xorg-cf-files-1.0.2 + +* Tue Apr 25 2006 Adam Jackson 1.0.1-4 +- Fix ExtraXawReqs to reflect reality (libXp is unneeded) + +* Mon Mar 06 2006 Mike A. Harris 1.0.1-3 +- Updated xorg-cf-files-1.0.1-redhat.patch with fix for (#178177) + +* Wed Mar 01 2006 Karsten Hopp 1.0.1-2 +- Buildrequires: xorg-x11-proto-devel + +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated all packages to version 1.0.1 from X11R7.0 + +* Wed Dec 21 2005 Than Ngo 1.0.0-4 +- final fix for #173593 + +* Tue Dec 20 2005 Than Ngo 1.0.0-3 +- add correct XAppLoadDir #173593 +- add more macros for fedora + +* Mon Dec 19 2005 Than Ngo 1.0.0-2 +- add some macros to fix problem in building of manpages + +* Sat Dec 17 2005 Mike A. Harris 1.0.0-1 +- Updated all packages to version 1.0.0 from X11R7 RC4 +- Added new lndir, gccmakedep tarballs. (#173478) +- Changed manpage dirs from man1x to man1 to match upstream RC4 default. +- Removed all previous 'misc' patch, as we now pass --with-config-dir to + configure to specify the location of the Imake config files. +- Renamed imake patch to xorg-cf-files-1.0.0-ProjectRoot.patch as it did not + patch imake at all. This should probably be changed to be a custom Red Hat + host.def file that is added as a source line instead of randomly patching + various files. + +* Fri Dec 09 2005 Jesse Keating 0.99.2-5.1 +- rebuilt + +* Mon Nov 28 2005 Than Ngo 0.99.2-5 +- add correct ProjectRoot for modular X + +* Wed Nov 16 2005 Than Ngo 0.99.2-4 +- add missing host.conf + +* Wed Nov 16 2005 Than Ngo 0.99.2-3 +- fix typo + +* Wed Nov 16 2005 Than Ngo 0.99.2-2 +- fix xmkmf to look config files in /usr/share/X11/config + instead /usr/%%{_lib}/X11/config/ +- add host.conf + +* Fri Nov 11 2005 Mike A. Harris 0.99.2-1 +- Updated to imake-0.99.2, xorg-cf-files-0.99.2, makedepend-0.99.2 from + X11R7 RC2. + +* Thu Nov 10 2005 Mike A. Harris 0.99.1-1 +- Initial build.