delorie.com/archives/browse.cgi   search  
Mail Archives: djgpp-workers/2007/03/19/11:30:16

X-Authentication-Warning: delorie.com: mail set sender to djgpp-workers-bounces using -f
In-Reply-To: <200703180505.l2I551V5025424@delorie.com>
Subject: Re: djgpp daily digest for 17 Mar 2007
To: djgpp-workers AT delorie DOT com
X-Mailer: Lotus Notes Release 7.0.2 September 26, 2006
Message-ID: <OFFFA89DA9.632B86DE-ON872572A3.005874D6-872572A3.005A888F@seagate.com>
From: Gordon DOT Schumacher AT seagate DOT com
Date: Mon, 19 Mar 2007 10:28:53 -0600
X-MIMETrack: Serialize by Router on SV-GW1/Seagate Internet(Release 7.0.1 HF29|March 07, 2006) at
03/19/2007 09:28:57 AM
MIME-Version: 1.0
X-Proofpoint-FWRule: outbound2
X-Proofpoint-Virus-Version: vendor=fsecure engine=4.65.5502:2.3.11,1.2.37,4.0.164 definitions=2007-03-19_04:2007-03-16,2007-03-19,2007-03-19 signatures=0
X-MIME-Autoconverted: from base64 to 8bit by delorie.com id l2JGTOTX006229
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com

Andris Pavenis <andris DOT pavenis AT iki DOT fi> wrote on Sat, 17 Mar 2007 at
11:43:31 +0200, in DJGPP-users <djgpp AT delorie DOT com>:

# Packages of DJGPP port of GCC-4.1.2 is at:
#
# http://ap1.pp.fi/djgpp/gcc/4.1.2/gcc412.html
#
# That includes:
# - Linux hosted cross-compiler source and binary RPMs for Fedora Core 6
# - Source package for DJGPP
# - Binary packages for DJGPP v2.03r2
# - Binary packages for DJGPP v2.04 development version

That reminds me - I did some hacking on the RPM specfiles that you
put up there, to better make use of the standard RPM variables.  I
started on that because I'm running a SuSE system, and some of the
installation paths are not quite the same as Red Hat systems.

Thanks for the linker script patch - that was the "magic" I'd been
missing to make my cross-toolchains work...!

These diffs are against the specfiles for 4.1.0 that are at
ftp://ftp.delorie.com/djgpp/rpms


--- old/djcrx.spec      2005-11-21 12:35:31.000000000 -0700
+++ new/djcrx.spec      2007-03-13 12:05:51.000000000 -0600
@@ -1,7 +1,7 @@
 Name: djcrx
 Summary:  DJGPP C library and some tools Linux to i586-pc-msdosdjgpp
cross-compiler
 Version: 2.04pre
-Release: 4
+Release: 5
 License: LGPL
 Group: Development/Tools
 URL: http://www.delorie.com/djgpp/
@@ -31,24 +31,27 @@
 export STRIP=/bin/true
 cd %{name}-%{version}
 rm -fr %{buildroot}
-mkdir -p %{buildroot}/usr/i586-pc-msdosdjgpp/bin
-mkdir -p %{buildroot}/usr/i586-pc-msdosdjgpp/sys-include
-mkdir -p %{buildroot}/usr/share/doc/%{name}-%{version}
-cp -rp include/* %{buildroot}/usr/i586-pc-msdosdjgpp/sys-include/
-cp -rp lib %{buildroot}/usr/i586-pc-msdosdjgpp/
-cp -p src/stub/stubify src/stub/stubedit
%{buildroot}/usr/i586-pc-msdosdjgpp/bin/
-cp -p copying* readme.1st %{buildroot}/usr/share/doc/%{name}-%{version}/
+mkdir -p %{buildroot}%{_prefix}/i586-pc-msdosdjgpp/bin
+mkdir -p %{buildroot}%{_prefix}/i586-pc-msdosdjgpp/sys-include
+mkdir -p %{buildroot}%{_prefix}/share/doc/%{name}-%{version}
+cp -rp include/* %{buildroot}%{_prefix}/i586-pc-msdosdjgpp/sys-include/
+cp -rp lib %{buildroot}%{_prefix}/i586-pc-msdosdjgpp/
+cp -p src/stub/stubify src/stub/stubedit
%{buildroot}%{_prefix}/i586-pc-msdosdjgpp/bin/
+cp -p copying* readme.1st
%{buildroot}%{_prefix}/share/doc/%{name}-%{version}/

 %clean
 rm -fr %{buildroot}

 %files
 %defattr(-,root,root)
-/usr/i586-pc-msdosdjgpp/*
-/usr/share/doc/*
+%{_prefix}/i586-pc-msdosdjgpp/*
+%{_prefix}/share/doc/*

 %changelog

+* Tue Mar 13 2007 Gordon Schumacher <gordon DOT schumacher AT seagate DOT com>
+- Updated to use RPM's prefix macros
+
 * Mon Nov 21 2005 Andris Pavenis <pavenis AT latnet DOT lv>
 - Some small updates

--- old/djcross-binutils.spec 2005-11-21 11:20:38.000000000 -0700
+++ new/djcross-binutils.spec 2007-03-13 13:51:59.000000000 -0600
@@ -1,7 +1,7 @@
 Name: djcross-binutils
 Summary:  Cross binutils for target i586-pc-msdosdjgpp
 Version: 2.16.1
-Release: 3
+Release: 4
 License: GPL
 Group: Development/Tools
 #URL: http://www.example.org/
@@ -22,15 +22,16 @@
 %patch1 -p1 -b .llinkscript

 %build
-./configure --target=i586-pc-msdosdjgpp --host=`./config.guess`
--prefix=/usr
+%configure --target=i586-pc-msdosdjgpp
--program-prefix=i586-pc-msdosdjgpp-
 make

 %install
 rm -fr %{buildroot}

 %makeinstall
-rm -f %{buildroot}/usr/lib/libiberty.a
-rm -f %{buildroot}/usr/share/info/*
+rm -f %{buildroot}%{_libdir}/libiberty.a
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}

 %clean
 rm -fr %{buildroot}
@@ -38,12 +39,14 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/*
-#%{_mandir}/*
 %{_datadir}/*
 /usr/i586-pc-msdosdjgpp/*
 #%{_doc}/*

 %changelog

+* Tue Mar 13 2007 Gordon Schumacher <gordon DOT schumacher AT seagate DOT com>
+- Updated to use RPM's prefix macros and %configure
+
 * Mon Nov 15 2005 Andris Pavenis <pavenis AT latnet DOT lv>
 — Initial version of rpm spec file for DJGPP cross-binutils


--- old/djcross-gcc.spec      2006-03-05 03:30:05.000000000 -0700
+++ new/djcross-gcc.spec      2007-03-19 10:21:41.000000000 -0600
@@ -4,7 +4,7 @@
 Name: djcross-gcc
 Summary:  GCC cross-compiler for target i586-pc-msdosdjgpp
 Version: 4.1.0
-Release: 2
+Release: 3
 License: GPL
 Group: Development/Tools
 URL: http://www.iki.fi/andris.pavenis/djgpp/gcc/cross-compiler
@@ -13,7 +13,10 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: i686
 Requires: djcrx djcross-binutils
-BuildPrereq: djcrx djcross-binutils autoconf >= 2.59 autoconf213 automake
>= 1.9.4 automake14
+BuildPrereq: djcrx djcross-binutils autoconf >= 2.59 autoconf213 automake
>= 1.9.4 automake14 gcc-ada
+
+%define shortver %(echo %{version} | sed -e 's:\\.::2g')
+%define shortver2 %(echo %{version} | sed -e 's:\\.::g')

 %description
 Support of the following programing languages is included:
@@ -23,14 +26,13 @@
     Objective C
     Objective C++
     Ada
+
 %prep
-export SHORTVER=`echo %{version} | sed -e 's:\.::2g'`
-export SHORTVER2=`echo %{version} | sed -e 's:\.::g'`
 rm -rf $RPM_BUILD_DIR/%{name}-%{version} || exit 1
 mkdir $RPM_BUILD_DIR/%{name}-%{version} || exit 1
 ln -s $RPM_SOURCE_DIR/gcc-%{version}.tar.bz2
$RPM_BUILD_DIR/%{name}-%{version}/ || exit 1
 cd $RPM_BUILD_DIR/%{name}-%{version} || exit 1
-unzip -aq $RPM_SOURCE_DIR/gcc${SHORTVER2}s2.zip || exit 1
+unzip -aq $RPM_SOURCE_DIR/gcc%{shortver2}s2.zip || exit 1
 sed -e 's:^\(AUTOCONF_OLD=\).*$:\1/usr/bin/autoconf-2.13:' \
     -e 's:^\(AUTOHEADER_OLD=\).*$:\1/usr/bin/autoheader-2.13:' \
     -e 's:^\(exec .*\)$:#\1:' unpack-gcc.sh >unpack-gcc.sh.new
@@ -39,11 +41,9 @@

 %build
 cd $RPM_BUILD_DIR/%{name}-%{version}
-export BUILD_NAME=`gnu/gcc-${SHORTVER}/config.guess`
-#
 mkdir tmpbuild || exit 1
 cd tmpbuild || exit 1
-../gnu/gcc-${SHORTVER}/configure
--prefix=$RPM_BUILD_DIR/%{name}-%{version}/tmpinst \
+../gnu/gcc-%{shortver}/configure
--prefix=$RPM_BUILD_DIR/%{name}-%{version}/tmpinst \
                    --enable-languages=c,ada \
                    --enable-__cxa_atexit || exit 1
 make bootstrap || exit 1
@@ -56,10 +56,23 @@
 cd djcross
 mkdir -p /usr/lib/gcc/i586-pc-msdosdjgpp/4.1.0
 gcc -v >$RPM_BUILD_DIR/%{name}-%{version}/gccver.stmp 2>&1
-../gnu/gcc-${SHORTVER}/configure --build=$BUILD_NAME \
-                   --host=$BUILD_NAME \
+../gnu/gcc-%{shortver}/configure --build=%{_build} \
+                   --host=%{_host} \
                    --target=i586-pc-msdosdjgpp \
-                   --prefix=/usr \
+                   --program-prefix=i586-pc-msdosdjgpp- \
+                   --prefix=%{_prefix} \
+                   --exec-prefix=%{_exec_prefix} \
+                   --bindir=%{_bindir} \
+                   --sbindir=%{_sbindir} \
+                   --sysconfdir=%{_sysconfdir} \
+                   --datadir=%{_datadir} \
+                   --includedir=%{_includedir} \
+                   --libdir=%{_libdir} \
+                   --libexecdir=%{_libexecdir} \
+                   --localstatedir=%{_localstatedir} \
+                   --sharedstatedir=%{_sharedstatedir} \
+                   --mandir=%{_mandir} \
+                   --infodir=%{_infodir} \
                    --disable-nls \
                    --enable-version-specific-runtime-libs \
                    --enable-languages=c,c++,f95,objc,obj-c++,ada || exit 1
@@ -71,29 +84,30 @@
 export STRIP=/bin/true
 cd $RPM_BUILD_DIR/%{name}-%{version}/djcross
 %makeinstall
-( cd %{buildroot}/usr/bin && strip -v * )
-rm -f %{buildroot}/usr/lib/libiberty.a
-rm -fr %{buildroot}/usr/share/man/man7/*
-rm -fr %{buildroot}/usr/share/info/*
+( cd %{buildrooot}%{_bindir} && strip -v * )
+rm -f %{buildroot}%{_libdir}/libiberty.a
+rm -fr %{buildroot}%{_mandir}/man7/*
+rm -fr %{buildroot}%{_infodir}/*

-( cd %{buildroot}/usr/libexec/gcc/i586-pc-msdosdjgpp/4.1.0 &&\
+( cd %{buildroot}%{_libexecdir}/gcc/i586-pc-msdosdjgpp/4.1.0 &&\
     strip -v cc1* collect2 f951 gnat1 install-tools/fixincl )
-( cd %{buildroot}/usr/bin && mv gfortran i586-pc-msdosdjgpp-gfortran )
-( cd %{buildroot}/usr/bin && mv gprmake i586-pc-msdosdjgpp-gprmake )

 %clean
 rm -fr %{buildroot}

 %files
 %defattr(-,root,root)
-/usr/bin/*
-/usr/lib/gcc/*
-/usr/libexec/gcc/*
-/usr/i586-pc-msdosdjgpp/*
-/usr/share/man/man1/*
+%{_bindir}/*
+%{_libdir}/gcc/*
+%{_libexecdir}/gcc/*
+%{_prefix}/i586-pc-msdosdjgpp/*
+%{_mandir}/man1/*

 %changelog

+* Tue Mar 13 2007 Gordon Schumacher <gordon DOT schumacher AT seagate DOT com>
+- Updated to use RPM's prefix macros
+
 * Sat Mar  5 2006 Andris Pavenis <andris DOT pavenis AT iki DOT fi>
 - Bootstrap at first native compiler to be used for building
   cross-compiler as one need to build cross-compiler with the
@@ -109,4 +123,4 @@

 * Mon Nov 15 2005 Andris Pavenis <pavenis AT latnet DOT lv>
 — Initial version of rpm spec file for DJGPP cross-compiler

- Raw text -


  webmaster     delorie software   privacy  
  Copyright 2019   by DJ Delorie     Updated Jul 2019