rpms/gnu-smalltalk/devel gnu-smalltalk.spec, 1.15, 1.16 gst-2.3.4-am.patch, 1.1, 1.2
Jochen Schmitt (s4504kr)
fedora-extras-commits at redhat.com
Wed May 30 18:33:37 UTC 2007
Author: s4504kr
Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26652
Modified Files:
gnu-smalltalk.spec gst-2.3.4-am.patch
Log Message:
Remove refs to shiped sigsegv lib
Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnu-smalltalk.spec 30 May 2007 17:12:06 -0000 1.15
+++ gnu-smalltalk.spec 30 May 2007 18:33:02 -0000 1.16
@@ -1,7 +1,7 @@
Summary: GNU Smalltalk
Name: gnu-smalltalk
Version: 2.3.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
Patch1: gst-2.3.4-am.patch
Patch2: gst-2.3.4-geo.patch
@@ -25,6 +25,7 @@
BuildRequires: libtool
BuildRequires: texinfo
BuildRequires: zlib-devel
+BuildRequires: libsigsegv-devel
%description
GNU Smalltalk is an implementation that closely follows the
@@ -64,7 +65,7 @@
%prep
%setup -q -n smalltalk-%{version}
-%patch1 -p1
+%patch1 -p1 -b .automake
%patch2 -p1
%patch3 -p1
@@ -84,7 +85,6 @@
rm -rf $RPM_BUILD_ROOT/%{_libdir}/libgst*a*
rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnu-smalltalk/*.la
-rm -rf $RPM_BUILD_ROOT/%{_includedir}/sigsegv.h
rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.a
@@ -147,6 +147,9 @@
%{_datadir}/emacs/site-lisp/*
%changelog
+* Wed May 30 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.4-2
+- Remove references to sigseg lib shiped with the package
+
* Mon May 28 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.4-1
- New upstream release
gst-2.3.4-am.patch:
Index: gst-2.3.4-am.patch
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gst-2.3.4-am.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gst-2.3.4-am.patch 30 May 2007 17:12:06 -0000 1.1
+++ gst-2.3.4-am.patch 30 May 2007 18:33:02 -0000 1.2
@@ -1,5 +1,5 @@
--- smalltalk-2.3.4/configure.automake 2007-05-28 12:40:14.000000000 +0200
-+++ smalltalk-2.3.4/configure 2007-05-28 19:01:25.000000000 +0200
++++ smalltalk-2.3.4/configure 2007-05-30 20:02:45.000000000 +0200
@@ -723,7 +723,7 @@
# Identity of this package.
@@ -9,7 +9,17 @@
PACKAGE_VERSION='2.3.4'
PACKAGE_STRING='GNU Smalltalk 2.3.4'
PACKAGE_BUGREPORT='help-smalltalk at gnu.org'
-@@ -1498,7 +1498,7 @@
+@@ -947,8 +947,7 @@
+ EMACS
+ EMACSLOADPATH'
+ ac_subdirs_all='libffi
+-snprintfv
+-sigsegv'
++snprintfv'
+
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -1498,7 +1497,7 @@
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
@@ -18,7 +28,7 @@
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
-@@ -2431,7 +2431,7 @@
+@@ -2431,7 +2430,7 @@
# Define the identity of the package.
@@ -27,8 +37,228 @@
VERSION='2.3.4'
+@@ -5236,7 +5235,140 @@
+ fi
+
+ if test $enable_generational_gc != no; then
+- subdirs="$subdirs sigsegv"
++ if test "${ac_cv_header_sigsegv_h+set}" = set; then
++ { echo "$as_me:$LINENO: checking for sigsegv.h" >&5
++echo $ECHO_N "checking for sigsegv.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_sigsegv_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sigsegv_h" >&5
++echo "${ECHO_T}$ac_cv_header_sigsegv_h" >&6; }
++else
++ # Is the header compilable?
++{ echo "$as_me:$LINENO: checking sigsegv.h usability" >&5
++echo $ECHO_N "checking sigsegv.h usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <sigsegv.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_compiler=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ echo "$as_me:$LINENO: checking sigsegv.h presence" >&5
++echo $ECHO_N "checking sigsegv.h presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <sigsegv.h>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ ac_header_preproc=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
++fi
++
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
++
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: sigsegv.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: sigsegv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sigsegv.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: sigsegv.h: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: sigsegv.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: sigsegv.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sigsegv.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: sigsegv.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sigsegv.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: sigsegv.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sigsegv.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: sigsegv.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sigsegv.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: sigsegv.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: sigsegv.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: sigsegv.h: in the future, the compiler will take precedence" >&2;}
++ ( cat <<\_ASBOX
++## ------------------------------------- ##
++## Report this to help-smalltalk at gnu.org ##
++## ------------------------------------- ##
++_ASBOX
++ ) | sed "s/^/$as_me: WARNING: /" >&2
++ ;;
++esac
++{ echo "$as_me:$LINENO: checking for sigsegv.h" >&5
++echo $ECHO_N "checking for sigsegv.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_sigsegv_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_header_sigsegv_h=$ac_header_preproc
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_header_sigsegv_h" >&5
++echo "${ECHO_T}$ac_cv_header_sigsegv_h" >&6; }
++
++fi
++if test $ac_cv_header_sigsegv_h = yes; then
++ MODULES_EXAMPLE="$MODULES_EXAMPLE sigsegv.la"
++fi
++
+
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -8459,7 +8591,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 8462 "configure"' > conftest.$ac_ext
++ echo '#line 8594 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -10017,11 +10149,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10020: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10152: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:10024: \$? = $ac_status" >&5
++ echo "$as_me:10156: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -10260,11 +10392,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10263: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10395: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:10267: \$? = $ac_status" >&5
++ echo "$as_me:10399: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -10320,11 +10452,11 @@
+ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10323: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10455: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10327: \$? = $ac_status" >&5
++ echo "$as_me:10459: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -12468,7 +12600,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12471 "configure"
++#line 12603 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12566,7 +12698,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12569 "configure"
++#line 12701 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -18069,7 +18201,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 18072 "configure"
++#line 18204 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
--- smalltalk-2.3.4/Makefile.in.automake 2007-05-28 12:40:11.000000000 +0200
-+++ smalltalk-2.3.4/Makefile.in 2007-05-28 19:01:27.000000000 +0200
++++ smalltalk-2.3.4/Makefile.in 2007-05-30 20:02:47.000000000 +0200
@@ -275,7 +275,7 @@
NCURSES_DISABLED = @NCURSES_DISABLED@
OBJDUMP = @OBJDUMP@
@@ -47,6 +277,15 @@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+@@ -348,7 +348,7 @@
+ # Automake requirements
+ AUTOMAKE_OPTIONS = gnu 1.8
+ ACLOCAL_AMFLAGS = -I build-aux
+-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
++DIST_SUBDIRS = lib-src snprintfv lightning libffi opcode libgst \
+ i18n tcp examples blox-tk . gtk tests doc
+
+ SUBDIRS = lib-src lightning $(subdirs) $(am__append_1) libgst i18n tcp \
@@ -1134,19 +1134,19 @@
install-data-hook: gst-package
rm -f $(DESTDIR)$(pkgdatadir)/packages.xml
@@ -71,16 +310,19 @@
installcheck-local:
--- smalltalk-2.3.4/Makefile.am.automake 2007-05-28 12:12:32.000000000 +0200
-+++ smalltalk-2.3.4/Makefile.am 2007-05-28 18:59:31.000000000 +0200
-@@ -19,7 +19,7 @@
++++ smalltalk-2.3.4/Makefile.am 2007-05-30 19:52:49.000000000 +0200
+@@ -19,9 +19,9 @@
AUTOMAKE_OPTIONS = gnu 1.8
ACLOCAL_AMFLAGS = -I build-aux
-PACKAGE=smalltalk
+PACKAGE=gnu-smalltalk
- DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
+-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
++DIST_SUBDIRS = lib-src snprintfv lightning libffi opcode libgst \
i18n tcp examples blox-tk . gtk tests doc
+
+ SUBDIRS = lib-src lightning $(subdirs)
@@ -50,6 +50,7 @@
###########################################################
@@ -113,7 +355,7 @@
installcheck-local:
--- smalltalk-2.3.4/configure.ac.automake 2007-05-28 12:39:36.000000000 +0200
-+++ smalltalk-2.3.4/configure.ac 2007-05-28 19:00:42.000000000 +0200
++++ smalltalk-2.3.4/configure.ac 2007-05-30 20:00:33.000000000 +0200
@@ -7,7 +7,7 @@
dnl Process this file with autoconf to produce a configure script.
@@ -123,8 +365,17 @@
MAINTAINER="bonzini at gnu.org"
dnl CURRENT:REVISION:AGE means this is the REVISION-th version of
+@@ -80,7 +80,7 @@
+ *) enable_generational_gc=yes ;;
+ esac])
+ if test $enable_generational_gc != no; then
+- AC_CONFIG_SUBDIRS(sigsegv)
++ AC_CHECK_HEADER(sigsegv.h, MODULES_EXAMPLE="$MODULES_EXAMPLE sigsegv.la")
+ AC_DEFINE(HAVE_SIGSEGV_H, 1,
+ [Define to 1 if libsigsegv is being used])
+ fi
--- smalltalk-2.3.4/examples/Makefile.in.automake 2007-05-28 12:40:07.000000000 +0200
-+++ smalltalk-2.3.4/examples/Makefile.in 2007-05-28 19:01:26.000000000 +0200
++++ smalltalk-2.3.4/examples/Makefile.in 2007-05-30 20:02:46.000000000 +0200
@@ -281,7 +281,7 @@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
@@ -135,7 +386,7 @@
EXTRA_LTLIBRARIES = gdbm.la zlib.la
pkglib_LTLIBRARIES = @MODULES_EXAMPLE@ md5.la
--- smalltalk-2.3.4/examples/Makefile.am.automake 2007-05-24 22:10:25.000000000 +0200
-+++ smalltalk-2.3.4/examples/Makefile.am 2007-05-28 18:51:51.000000000 +0200
++++ smalltalk-2.3.4/examples/Makefile.am 2007-05-30 19:52:14.000000000 +0200
@@ -1,4 +1,4 @@
-examplemodulesdir = $(pkgdatadir)/examples/modules
+examplemodulesdir = $(imagedir)/examples/modules
@@ -143,8 +394,30 @@
dist_examplemodules_DATA = gdbm.st gdbm-c.st md5.st zlib.st zlibtests.st
--- smalltalk-2.3.4/libgst/Makefile.am.automake 2007-02-13 17:32:35.000000000 +0100
-+++ smalltalk-2.3.4/libgst/Makefile.am 2007-05-28 18:51:51.000000000 +0200
-@@ -113,6 +113,7 @@
++++ smalltalk-2.3.4/libgst/Makefile.am 2007-05-30 20:02:09.000000000 +0200
+@@ -15,10 +15,6 @@
+ -I$(top_srcdir) -I$(top_builddir)
+ endif
+
+-if HAVE_SIGSEGV
+-AM_CPPFLAGS += -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
+-endif
+-
+ include_HEADERS = gstpub.h gst.h
+ lib_LTLIBRARIES = libgst.la
+ EXTRA_PROGRAMS = genprims genbc genvm
+@@ -33,8 +29,8 @@
+ $(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
+
+ if HAVE_SIGSEGV
+-libgst_la_LIBADD += $(top_builddir)/sigsegv/src/libsigsegv.la
+-libgst_la_DEPENDENCIES += $(top_builddir)/sigsegv/src/libsigsegv.la
++libgst_la_LIBADD += libsigsegv.la
++libgst_la_DEPENDENCIES += libsigsegv.la
+ endif
+
+ libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \
+@@ -113,6 +109,7 @@
@echo timestamp > $(srcdir)/match.stamp
More information about the fedora-extras-commits
mailing list