Dr. Werner Fink 2010-07-16 13:10:13 +00:00 committed by Git OBS Bridge
parent bcea4a4638
commit e608de8613
4 changed files with 40 additions and 8 deletions

View File

@ -286,7 +286,7 @@
#elif !(oint_addr_shift==0)
#define type_data_object(type,data) \
--- src/makemake.in
+++ src/makemake.in 2008-02-25 13:00:18.000000000 +0000
+++ src/makemake.in 2010-07-16 09:24:56.183425374 +0000
@@ -228,6 +228,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
# Handle --with-... arguments
while test -z "$endofargs"; do
@ -308,6 +308,16 @@
else
if [ $TSYS = sun4 -a $CROSS = false ] ; then
@@ -3593,7 +3600,8 @@ if [ $CROSS = false ] ; then
echotab " mkdir -p \"\$\$absdest/\$\$m\"; \\"
echotab " cd \$\$m; \$(MAKE) clisp-module-distrib LN=\"\$(INSTALL_DATA)\" distribdir=\"\$\$absdest/\$\$m\" ; cd \"\$\$here\"; \\"
echotab " done; fi"
- line='linkkit/* base/*'
+ echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
+ line='linkkit/* base/* full/*'
else
echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
line='linkkit/* base/* full/*'
--- src/build-aux/config.guess
+++ src/build-aux/config.guess 2010-07-14 13:01:48.000000000 +0000
@@ -870,29 +870,29 @@ EOF

View File

@ -1,5 +1,5 @@
--- configure
+++ configure 2008-02-25 13:01:29.000000000 +0000
+++ configure 2010-07-15 08:38:16.978924992 +0000
@@ -393,11 +393,11 @@ do
passnext=both ;;
@ -14,6 +14,18 @@
makemake_args="$makemake_args --vimdir="
prev=vimdir
passnext=both ;;
@@ -430,11 +430,9 @@ do
passnext=configure ;;
--build=* | --buil=* | --bui=* | --bu=*)
- target=cross
subdir_configure_args="$subdir_configure_args $arg" ;;
--build | --buil | --bui | --bu)
- target=cross
subdir_configure_args="$subdir_configure_args $arg"
prev=host
passnext=configure ;;
--- ffcall-1.10+2.43/build-aux/config.guess
+++ ffcall-1.10+2.43/build-aux/config.guess 2008-02-25 13:00:18.000000000 +0000
@@ -985,6 +985,7 @@ EOF
@ -53,7 +65,7 @@
'(*version* access-control access-error access-hosts activate-screen-saver
add-access-host add-resource add-to-save-set alist alloc-color
--- modules/clx/new-clx/demos/clx-demos.lisp
+++ modules/clx/new-clx/demos/clx-demos.lisp 2010-07-14 12:49:25.178925069 +0000
+++ modules/clx/new-clx/demos/clx-demos.lisp 2010-07-14 12:49:25.000000000 +0000
@@ -11,7 +11,7 @@
(defparameter *demos*
@ -226,7 +238,7 @@
fi
popdef([P_A_C_K])
--- src/lispbibl.d
+++ src/lispbibl.d 2010-07-14 12:53:05.182926260 +0000
+++ src/lispbibl.d 2010-07-14 12:53:05.000000000 +0000
@@ -121,7 +121,7 @@
#define PC386 /* IBMPC-compatible with 80386/80486-processor */
#endif
@ -274,7 +286,7 @@
#elif !(oint_addr_shift==0)
#define type_data_object(type,data) \
--- src/makemake.in
+++ src/makemake.in 2008-02-25 13:00:18.000000000 +0000
+++ src/makemake.in 2010-07-16 09:04:08.998925020 +0000
@@ -228,6 +228,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
# Handle --with-... arguments
while test -z "$endofargs"; do
@ -296,8 +308,17 @@
else
if [ $TSYS = sun4 -a $CROSS = false ] ; then
@@ -3593,7 +3600,7 @@ if [ $CROSS = false ] ; then
echotab " mkdir -p \"\$\$absdest/\$\$m\"; \\"
echotab " cd \$\$m; \$(MAKE) clisp-module-distrib LN=\"\$(INSTALL_DATA)\" distribdir=\"\$\$absdest/\$\$m\" ; cd \"\$\$here\"; \\"
echotab " done; fi"
- line='linkkit/* base/*'
+ line='linkkit/* base/* full/*'
else
echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
line='linkkit/* base/* full/*'
--- src/build-aux/config.guess
+++ src/build-aux/config.guess 2010-07-14 13:01:48.054925329 +0000
+++ src/build-aux/config.guess 2010-07-14 13:01:48.000000000 +0000
@@ -870,29 +870,29 @@ EOF
esac
objdump --private-headers /bin/sh | grep -q ld.so.1

View File

@ -1,3 +1,5 @@
addFilter(".*devel-file-in-non-devel-package.*/usr/lib/clisp-.*/.*")
addFilter(".*files-duplicate.*/usr/lib/clisp-.*/.*")
addFilter(".*make-check-outside-check-section.*make\ check.*")
addFilter(".*executable-stack.*/usr/lib/clisp-2.49/.*")
addFilter(".*binary-or-shlib-calls-gethostbyname.*/usr/lib/clisp-2.49/.*")

View File

@ -19,7 +19,7 @@
Name: clisp
BuildRequires: db-devel dbus-1-devel gdbm-devel gtk2-devel libglade2-devel openssl-devel pcre-devel postgresql-devel readline-devel xorg-x11-devel
BuildRequires: db-devel dbus-1-devel fdupes gdbm-devel gtk2-devel libglade2-devel openssl-devel pcre-devel postgresql-devel readline-devel xorg-x11-devel
#
# If set to yes do not forget to add
# gcc-c++
@ -278,7 +278,6 @@ popd
#
install -d %{buildroot}${CLXDOC}
install -d %{buildroot}${CLXLIB}
install -d %{buildroot}${LSPLIB}/fullnox
pushd modules/clx/new-clx/
install -c -m 0444 README %{buildroot}${CLXDOC}/
install -c -m 0444 %{S:4} %{buildroot}${CLXDOC}/