rpms/compat-guile-16/devel compat-guile-16.spec, NONE, 1.1 guile-1.6.0-ppc64.patch, NONE, 1.1 guile-1.6.0-unknown_arch.patch, NONE, 1.1 guile-1.6.7-64bit.patch, NONE, 1.1 guile-1.6.7-ltdl.patch, NONE, 1.1 guile-1.6.7-noexecstack.patch, NONE, 1.1 guile-1.6.7-rpath.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Chitlesh GOORAH (chitlesh) fedora-extras-commits at redhat.com
Fri Jan 12 19:05:19 UTC 2007


Author: chitlesh

Update of /cvs/extras/rpms/compat-guile-16/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22544/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compat-guile-16.spec guile-1.6.0-ppc64.patch 
	guile-1.6.0-unknown_arch.patch guile-1.6.7-64bit.patch 
	guile-1.6.7-ltdl.patch guile-1.6.7-noexecstack.patch 
	guile-1.6.7-rpath.patch 
Log Message:
auto-import compat-guile-16-1.6.7-5 on branch devel from compat-guile-16-1.6.7-5.src.rpm


--- NEW FILE compat-guile-16.spec ---
%define qthreads_archs i386 sparc
# Once 'as' is fixed on alpha, that arch should be added to qthreads_archs

Name:           compat-guile-16
Version:        1.6.7
Release:        5%{?dist}
Summary:        A GNU implementation of Scheme for application extensibility

License:        GPL
Group:          Development/Languages
URL:            http://www.gnu.org/software/guile

Source:         ftp://ftp.gnu.org/gnu/guile-%{version}.tar.gz
Source2:        http://ai.king.net.pl/guile-1.6-missing-tools.tar.gz

Patch1:         guile-1.6.7-rpath.patch
Patch2:         guile-1.6.0-unknown_arch.patch
Patch3:         guile-1.6.0-ppc64.patch
Patch4:         guile-1.6.7-ltdl.patch
Patch5:         guile-1.6.7-64bit.patch
Patch6:         guile-1.6.7-noexecstack.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libtool, libtool-ltdl-devel, readline-devel
Requires:       slib >= 3a1-1

%description
GUILE (GNU's Ubiquitous Intelligent Language for Extension) is a library
implementation of the Scheme programming language, written in C.  GUILE
provides a machine-independent execution platform that can be linked in
as a library during the building of extensible programs.

This is a compatibility package for the old guile version 1.6.

%package devel
Summary: Header files for the GUILE extensibility library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, automake


%description -n %{name}-devel
The %{name}-devel package contains the header files for the GUILE
libraries.

This is a compatibility package for the old guile version 1.6.


%prep
%setup -q -n guile-%{version}
%patch1 -p1 -b .rpath6
%patch2 -p1 -b .unknown_arch
%patch3 -p1 -b .ppc64
%patch4 -p1 -b .ltdl
%patch5 -p1 -b .64bit
%patch6 -p1 -b .noexecstack


%build

WITH_THREADS=--with-threads
%ifnarch %{qthreads_archs}
WITH_THREADS=
%endif

%ifarch ia64
export CFLAGS="$RPM_OPT_FLAGS -O0"
%endif
%configure --disable-static $WITH_THREADS

# Multilib fix for procedures.txt
perl -pi -e 's|threads.doc||' `find . -name Makefile`

%{__make} %{?_smp_mflags} -C libguile scmconfig.h
# Ouch! guile forgets to set its own shared lib path to use shared uninstalled
# apps. It ain't pretty, but it works.
LD_LIBRARY_PATH="`pwd`/libguile/.libs:`pwd`/qt/.libs:`pwd`/libguile-ltdl/.libs" \
    %{__make} LDFLAGS="-L`pwd`/libguile/.libs" %{?_smp_mflags}

# Compression should be here for --short-circult
# Compress large documentation
bzip2 NEWS

%install
%{__rm} -rf %{buildroot}

# Convince guile to be packaged.
perl -p -i -e "s|^libdir.*|libdir='%{buildroot}%{_libdir}'|g" \
        guile-readline/libguilereadline.la

perl -p -i -e "s|^relink_command.*||g" guile-readline/libguilereadline.la

%{__make} INSTALL="install -p" install DESTDIR=%{buildroot}

# Fix up libtool libraries.
find %{buildroot} -name '*.la' | \
  xargs perl -p -i -e "s|%{buildroot}||g"

chmod 0755 %{buildroot}%{_libdir}/libguile.so.*
ln -s ../../share/slib %{buildroot}%{_datadir}/guile/slib


# Install additional scripts
tar zxvf %{SOURCE2}
pushd guile-1.6-missing-tools
%{__cp} -ap scripts/* %{buildroot}%{_datadir}/guile/1.6/scripts
chmod 0755 %{buildroot}%{_datadir}/guile/1.6/scripts/*
%{__cp} -ap ice-9/* %{buildroot}%{_datadir}/guile/1.6/ice-9
popd

%{__mv} %{buildroot}%{_bindir}/guile %{buildroot}%{_bindir}/guile-1.6
%{__mv} %{buildroot}%{_bindir}/guile-tools %{buildroot}%{_bindir}/guile-tools-1.6
%{__mv} %{buildroot}%{_bindir}/guile-config %{buildroot}%{_bindir}/guile-config-1.6
%{__mv} %{buildroot}%{_bindir}/guile-snarf %{buildroot}%{_bindir}/guile-snarf-1.6
sed -i "s|%{_bindir}/guile|%{_bindir}/guile-1.6|" %{buildroot}%{_bindir}/guile-config-1.6
sed -i 's|-lguile |-lguile16 |' %{buildroot}%{_bindir}/guile-config-1.6

# Remove unpackaged files
%{__rm} -f %{buildroot}%{_bindir}/guile-{doc-snarf,func-name-check,snarf.awk}
%{__rm} -rf %{buildroot}%{_includedir}/guile-readline
%{__rm} -rf %{buildroot}%{_datadir}/info
%{__rm} -f %{buildroot}%{_libdir}/*.{a,la}

# Prevents conflicts with guile-devel
%{__mv} %{buildroot}%{_includedir}/guile %{buildroot}%{_includedir}/guile16
%{__mv} %{buildroot}%{_includedir}/libguile %{buildroot}%{_includedir}/libguile16
%{__mv} %{buildroot}%{_includedir}/libguile.h %{buildroot}%{_includedir}/libguile16.h
%{__mv} %{buildroot}%{_datadir}/aclocal/guile.m4 %{buildroot}%{_datadir}/aclocal/guile16.m4
%{__mv} %{buildroot}%{_libdir}/libguile.so %{buildroot}%{_libdir}/libguile16.so
sed -i "s|libguile|libguile16|" %{buildroot}%{_includedir}/libguile16.h
sed -i "s|libguile|libguile16|" %{buildroot}%{_includedir}/guile16/gh.h
sed -i "s|libguile|libguile16|" `find  %{buildroot}%{_includedir}/libguile16 -name '*.h'`

%clean
%{__rm} -rf %{buildroot}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog GUILE-VERSION README
%{_bindir}/guile-1.6
%{_bindir}/guile-tools-1.6
%{_libdir}/libguile*.so.*
%{_libdir}/libqthreads.so.*
%{_datadir}/guile/1.6
%{_datadir}/guile/slib


%files devel
%doc HACKING NEWS.bz2 THANKS SNAPSHOTS ANON-CVS
%defattr(-,root,root,-)
%{_bindir}/guile-config-1.6
%{_bindir}/guile-snarf-1.6
%{_libdir}/libguile*.so
%{_libdir}/libqthreads.so
%{_includedir}/guile16
%{_includedir}/libguile16
%{_includedir}/libguile16.h
%{_datadir}/aclocal/guile16.m4


%Changelog
* Wed Jan 10 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.7-5
- Added automake in requires
- some minor corrections

* Sun Jan 07 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.7-4
- Added automake in BR

* Sat Jan 06 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.7-3.1
- Naming rule change, especially for libraries/header files.
- Move two scripts to -devel.

* Wed Dec 13 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.6.7-3
- take over the ownership of this package
- added timestamps during make install
- dropped the compat-libguile package
- clean ups

* Thu Dec  7 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.6.7-2
- clean up spec

* Mon Dec  4 2006 Gerard Milmeister <gemi at bluewin.ch> - 1.6.7-1
- make compability package

* Tue Feb 28 2006 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.6.7-6
- move .la files for modules from devel to main package (#182242)

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 5:1.6.7-5.2
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 5:1.6.7-5.1
- rebuilt for new gcc4.1 snapshot and glibc changes

* Mon Feb 06 2006 Miroslav Lichvar <mlichvar at redhat.com> 5:1.6.7-5
- Avoid marking qthreads library as requiring executable stack (#179274)

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Fri Sep 02 2005 Phil Knirsch <pknirsch at redhat.com> 5:1.6.7-4
- Fix dynamic linking on 64bit archs (#159971)

* Wed Mar 02 2005 Phil Knirsch <pknirsch at redhat.com> 5:1.6.7-2
- bump release and rebuild with gcc 4
- Fixed problem with ltdl and gcc 4 rebuild
- Add BuildPreReq for libtool-ltdl-devel

* Wed Feb 09 2005 Phil Knirsch <pknirsch at redhat.com> 5:1.6.7-1
- Update to guile-1.6.7
- Dropped ia64 patch, stuff looks fixed in upstream code

* Wed Jan 12 2005 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-18
- rebuilt because of new readline

* Thu Dec 23 2004 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-17
- Fixed wrong post and postun use of /sbin/ldconfig (#143657)

* Tue Dec 21 2004 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-16
- Moved info files to base package as they are not devel related (#139948)
- Moved static guilereadline and guile-srfi-srfi libs to devel package (#140893)
- Fixed guile-tools not finding guile lib dir (#142642)
- Added some nice tools (#142642)
- Removed smp build, seems to be broken atm

* Wed Dec  8 2004 Jindrich Novy <jnovy at redhat.com> 5:1.6.4-15
- remove dependency to umb-scheme and replace it by slib

* Tue Oct 12 2004 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-14
- Fix multilib support for guile

* Tue Aug 03 2004 Phil Knirsch <pknirsch at redhat.com>  5:1.6.4-13
- Enable optimization again for s390.

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Apr 16 2004 Warren Togami <wtogami at redhat.com> 5:1.6.4-11
- Fix post failure and duplicate rpm in database
- Compress NEWS
- other minor cleanups

* Wed Apr 14 2004 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-10
- Fixed info file stuff (#112487)

* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed Aug 27 2003 Bill Nottingham <notting at redhat.com> 5:1.6.4-8.2
- rebuild (#103148)

* Tue Aug 19 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-8.1
- rebuilt

* Tue Aug 19 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-8
- Moved dynamic loadable libraries out file devel into main (#98392).

* Wed Jul 02 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-7.1
- rebuilt

* Wed Jul 02 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-7
- Added srfi libs (#98392).

* Sun Jun  8 2003 Tim Powers <timp at redhat.com> 5:1.6.4-6.1
- add epoch for versioned requires
- built for RHEL

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Fri May 16 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-5
- Bumped release and rebuilt.

* Fri May 16 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-4
- Install and package info files, too.

* Fri May 16 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-3
- Bumped release and rebuilt.

* Fri May 16 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-2
- Fixed .la file problem, moved from devel to normal package.

* Tue May 06 2003 Phil Knirsch <pknirsch at redhat.com> 5:1.6.4-1
- Update to 1.6.4

* Thu Feb 13 2003 Elliot Lee <sopwith at redhat.com> 5:1.6.0-5
- Patch7 - fix for ppc64
- Fix qthreads dealie, including actually enabling them

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Fri Dec 06 2002 Phil Knirsch <pknirsch at redhat.com> 5:1.6.0-3
- Included s390 as working arch as well, switch to general unknown arch patch

* Tue Dec  3 2002 Tim Powers <timp at redhat.com> 5:1.6.0-2
- rebuild to fix broken deps
- fix continuations.h on ia64

* Tue Dec 03 2002 Phil Knirsch <pknirsch at redhat.com> 1.6.0-1
- Make it build on x86_64.
- Integrated and fixed Than's update to 1.6.0.
- Fixed some things in the %%files section.

* Mon Nov 11 2002 Than Ngo <timp at redhat.com> 1.4.1-2
- fix to build on s390*/x86_64 -> include libguilereadline.so
- fix to link libltdl
- don't use rpath

* Thu Nov 07 2002 Phil Knirsch <pknirsch at redhat.com> 1.4.1-1
- Updated to guile-1.4.1
- libguilereadline.so doesn't work on x86_64 yet, so don't package it.

* Wed Nov 06 2002 Phil Knirsch <pknirsch at redhat.com> 1.4-10
- Fixed unpackaged files.

* Tue Nov  5 2002 Bill Nottingham <notting at redhat.com> 1.4-9
- Remove qthread from x86_64 as well.

* Wed Jul 17 2002 Phil Knirsch <pknirsch at redhat.com> 1.4-8
- Remove qthread from ppc as well.

* Wed Jul 10 2002 Phil Knirsch <pknirsch at redhat.com> 1.4-7
- Fixed some more %%files lib related errors ().

* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 1.4-6
- automated rebuild

* Wed Jun 19 2002 Phil Knirsch <pknirsch at redhat.com> 1.4-5
- Don't forcibly strip binaries

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Mon May 06 2002 Florian La Roche <Florian.LaRoche at redhat.de>
- adjust for mainframe and alpha

* Fri Jan 25 2002 Bill Nottingham <notting at redhat.com>
- ship qthread devel links too

* Fri Jan 25 2002 Phil Knirsch <pknirsch at redhat.com>
- Update again to 1.4.
- Disable --with-threads for IA64 as it doesn't work.

* Thu Jan 24 2002 Phil Knirsch <pknirsch at redhat.com> 1.3.4-17/4
- Enabled --with-threads and removed --enable-dynamic-linking for configure
  (bug #58597)

* Mon Sep  3 2001 Philipp Knirsch <pknirsch at redhat.de> 1.3.4-16/3
- Fixed problem with read-only /usr pollution of /usr/share/umb-scheme/slibcat
  (#52742)

* Wed Aug 22 2001 Philipp Knirsch <pknirsch at redhat.de> 1.3.4-15/2
- Fixed /tmp buildroot pollution (#50398)

* Mon Jun 12 2001 Florian La Roche <Florian.LaRoche at redhat.de> 1.3.4-14/1
- size_t patch from <oliver.paukstadt at millenux.com>

* Fri May 11 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.3.4-13/1
- Rebuild with new readline

* Wed Feb 28 2001 Philipp Knirsch <pknirsch at redhat.de>
- Fixed missing devel version dependancy.
- Fixed bug #20134 for good this time.

* Mon Jan 22 2001 Than Ngo <than at redhat.com>
- disable optimization on ia64 (compiler bug) (bug #23186)

* Tue Dec 12 2000 Philipp Knirsch <Philipp.Knirsch at redhat.de>
- Fixed %%files bug #20134 where the /usr/lib/libguilereadline.so didn't get
  installed for the non devel version.

* Fri Jul 14 2000 Nalin Dahyabhai <nalin at redhat.com>
- Add version number to prereq for umb-scheme to get the post-install to
  work properly.

* Thu Jul 13 2000 Nalin Dahyabhai <nalin at redhat.com>
- Add an Epoch = 1 in case anyone happened to have 1.4 installed.

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Tue Jul 11 2000 Nalin Dahyabhai <nalin at redhat.com>
- Back down to 1.3.4.
- Fix to actually link against the version of libguile in the package.

* Sun Jun  4 2000 Nalin Dahyabhai <nalin at redhat.com>
- FHS fixups using the %%{makeinstall} macro.

* Sun Mar 26 2000 Florian La Roche <Florian.LaRoche at redhat.com>
- fix preun-devel
- call ldconfig directly in postun

* Fri Mar 24 2000 Bernhard Rosenkraenzer <bero at redhat.com>
- rebuild with new readline
- update to 1.3.4

* Mon Feb 28 2000 Nalin Dahyabhai <nalin at redhat.com>
- using the same catalog as umb-scheme makes umb-scheme a prereq

* Thu Feb 17 2000 Florian La Roche <Florian.LaRoche at redhat.com>
- readline is needed for %%post

* Tue Feb  8 2000 Nalin Dahyabhai <nalin at redhat.com>
- use the same catalog as umb-scheme

* Thu Sep  2 1999 Jeff Johnson <jbj at redhat.com>
- fix broken %%postun

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
- auto rebuild in the new build environment (release 6)

* Wed Mar 17 1999 Michael Johnson <johnsonm at redhat.com>
- added .ansi patch to fix #endif

* Wed Feb 10 1999 Cristian Gafton <gafton at redhat.com>
- add patch for the scm stuff

* Sun Jan 17 1999 Jeff Johnson <jbj at redhat.com>
- integrate changes from rhcn version (#640)

* Tue Jan 12 1999 Cristian Gafton <gafton at redhat.com>
- call libtoolize first to get it to compile on the arm

* Sat Jan  9 1999 Todd Larason <jtl at molehill.org>
- Added "Requires: guile" at suggestion of Manu Rouat <emmanuel.rouat at wanadoo.fr>

* Fri Jan  1 1999 Todd Larason <jtl at molehill.org>
- guile-devel does depend on guile
- remove devel dependancy on m4
- move guile-snarf from guile to guile-devel
- Converted to rhcn

* Wed Oct 21 1998 Jeff Johnson <jbj at redhat.com>
- update to 1.3.
- don't strip libguile.so.*.0.0. (but set the execute bits).

* Thu Sep 10 1998 Cristian Gafton <gafton at redhat.com>
- spec file fixups

* Wed Sep  2 1998 Michael Fulbright <msf at redhat.com>
- Updated for RH 5.2

* Mon Jan 26 1998 Marc Ewing <marc at redhat.com>
- Started with spec from Tomasz Koczko <kloczek at idk.com.pl>
- added slib link

* Thu Sep 18 1997 Tomasz Koczko <kloczek at idk.com.pl>          (1.2-3)
- added %%attr(-, root, root) for %%doc,
- in %%post, %%postun ldconfig runed as parameter "-p",
- removed /bin/sh from requires,
- added %%description,
- changes in %%files.

* Fri Jul 11 1997 Tomasz Koczko <kloczek at rudy.mif.pg.gda.pl>  (1.2-2)
- all rewrited for using Buildroot,
- added %%postun,
- removed making buid logs,
- removed "--inclededir", added "--enable-dynamic-linking" to configure
  parameters,
- added striping shared libs and /usr/bin/guile,
- added "Requires: /bin/sh" (for guile-snarf) in guile package and
  "Requires: m4" for guile-devel,
- added macro %%{PACKAGE_VERSION} in "Source:" and %%files,
- added %%attr macros in %%files.

guile-1.6.0-ppc64.patch:

--- NEW FILE guile-1.6.0-ppc64.patch ---
--- guile-1.6.0/libguile/gc_os_dep.c.sopwith	2003-02-11 08:53:15.000000000 -0500
+++ guile-1.6.0/libguile/gc_os_dep.c	2003-02-11 09:01:43.000000000 -0500
@@ -203,6 +203,10 @@
 #    define POWERPC
 #    define mach_type_known
 # endif
+# if defined(LINUX) && defined(__powerpc64__)
+#    define POWERPC64
+#    define mach_type_known
+# endif
 # if defined(LINUX) && defined(__mc68000__)
 #    define M68K
 #    define mach_type_known
@@ -591,6 +595,19 @@
 #   endif
 # endif
 
+# ifdef POWERPC64
+#   define MACH_TYPE "POWERPC64"
+#   define ALIGNMENT 8
+#   define CPP_WORDSZ 64
+#   define HEURISTIC1
+#   define DYNAMIC_LOADING
+#   undef STACK_GRAN
+#   define STACK_GRAN 0x10000000
+#   define LINUX_DATA_START
+    extern int _end;
+#   define DATAEND (&_end)
+# endif
+
 # ifdef POWERPC
 #   define MACH_TYPE "POWERPC"
 #   ifdef MACOS

guile-1.6.0-unknown_arch.patch:

--- NEW FILE guile-1.6.0-unknown_arch.patch ---
--- guile-1.6.0/libguile/gc_os_dep.c.unknown_arch	2002-07-08 11:09:32.000000000 -0400
+++ guile-1.6.0/libguile/gc_os_dep.c	2002-12-05 08:58:12.000000000 -0500
@@ -195,11 +195,11 @@
 #    define I386
 #    define mach_type_known
 # endif
-# if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
+# if defined(LINUX) && (defined(__ia64__) || defined(__ia64)) || defined(__x86_64__)
 #    define IA64
 #    define mach_type_known
 # endif
-# if defined(LINUX) && defined(powerpc)
+# if defined(LINUX) && defined(powerpc) || defined(__s390__)
 #    define POWERPC
 #    define mach_type_known
 # endif

guile-1.6.7-64bit.patch:

--- NEW FILE guile-1.6.7-64bit.patch ---
--- guile-1.6.4/configure.lib64 2005-06-09 12:34:40.486511382 -0700
+++ guile-1.6.4/configure       2005-06-09 12:49:59.772813211 -0700
@@ -6876,6 +6876,13 @@ linux-gnu*)
   # before this can be enabled.
   hardcode_into_libs=yes

+  case $host_cpu in
+  x86_64|s390x)
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+    ;;
+  esac
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,

guile-1.6.7-ltdl.patch:

--- NEW FILE guile-1.6.7-ltdl.patch ---
--- guile-1.6.7/libguile/guile.c.ltdl	2005-03-02 16:31:46.000000000 +0100
+++ guile-1.6.7/libguile/guile.c	2005-03-02 16:32:07.000000000 +0100
@@ -53,6 +53,7 @@
 #endif
 
 #ifdef DYNAMIC_LINKING
+#include <ltdl.h>
 #include "guile-ltdl.h"
 #endif
 
@@ -88,7 +89,7 @@
 {
 #ifdef DYNAMIC_LINKING
   /* libtool automagically inserts this variable into your executable... */
-  extern const scm_lt_dlsymlist lt_preloaded_symbols[];
+  extern const lt_dlsymlist lt_preloaded_symbols[];
   scm_lt_dlpreload_default (lt_preloaded_symbols);
 #endif
   scm_boot_guile (argc, argv, inner_main, 0);

guile-1.6.7-noexecstack.patch:

--- NEW FILE guile-1.6.7-noexecstack.patch ---
--- guile-1.6.7/configure.orig	2004-11-12 04:45:58.000000000 +0100
+++ guile-1.6.7/configure	2006-02-06 14:52:31.000000000 +0100
@@ -31286,6 +31286,7 @@
           qthread_asflags='-x assembler-with-cpp'
         ;;
       esac
+      qthread_asflags='-Wa,--noexecstack'
       ;;
     mips-sgi-irix[56]*)
       port_name=irix

guile-1.6.7-rpath.patch:

--- NEW FILE guile-1.6.7-rpath.patch ---
--- guile-1.6.7/guile-readline/configure.rpath	2004-11-12 04:46:13.000000000 +0100
+++ guile-1.6.7/guile-readline/configure	2005-02-09 18:45:11.000000000 +0100
@@ -7599,8 +7599,8 @@
     esac
 
     if test "$ld_shlibs" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+      runpath_var=
+      hardcode_libdir_flag_spec=
       export_dynamic_flag_spec='${wl}--export-dynamic'
       # ancient GNU ld didn't support --whole-archive et. al.
       if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-guile-16/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2007 19:01:08 -0000	1.1
+++ .cvsignore	12 Jan 2007 19:04:49 -0000	1.2
@@ -0,0 +1,2 @@
+guile-1.6-missing-tools.tar.gz
+guile-1.6.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-guile-16/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2007 19:01:08 -0000	1.1
+++ sources	12 Jan 2007 19:04:49 -0000	1.2
@@ -0,0 +1,2 @@
+cfd9cac8726502d81ee29f32330b6900  guile-1.6-missing-tools.tar.gz
+c2ff2a2231f0cbb2e838dd8701a587c5  guile-1.6.7.tar.gz




More information about the scm-commits mailing list