Mailinglist Archive: opensuse-commit (1945 mails)

< Previous Next >
commit smlnj
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 03 Nov 2008 14:24:05 +0100
  • Message-id: <20081103132405.B8A9E678174@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package smlnj
checked in at Mon Nov 3 14:24:05 CET 2008.


--------
--- arch/i386/smlnj/smlnj.changes 2008-02-13 15:00:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/smlnj/smlnj.changes 2008-10-30
13:15:50.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Oct 30 13:15:42 CET 2008 - schwab@xxxxxxx
+
+- Fix embedded paths.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
minmem
smlnj-110.67.tar.bz2

New:
----
smlnj-110.68.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ smlnj.spec ++++++
--- /var/tmp/diff_new_pack.V28120/_old 2008-11-03 14:23:41.000000000 +0100
+++ /var/tmp/diff_new_pack.V28120/_new 2008-11-03 14:23:41.000000000 +0100
@@ -1,10 +1,17 @@
#
-# spec file for package smlnj (Version 110.67)
+# spec file for package smlnj (Version 110.68)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

@@ -12,7 +19,7 @@

Name: smlnj
Summary: Standard ML of New Jersey
-Version: 110.67
+Version: 110.68
Release: 1
Group: Development/Languages/Other
License: BSD 3-Clause
@@ -47,21 +54,18 @@
%patch2

%build
+CFLAGS=$RPM_OPT_FLAGS config/install.sh

%install
mkdir -p $RPM_BUILD_ROOT%{_libdir}/smlnj
-CFLAGS=$RPM_OPT_FLAGS INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/smlnj
config/install.sh
+cp -a bin lib $RPM_BUILD_ROOT%{_libdir}/smlnj
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-n=${RPM_BUILD_ROOT//?/ }
-for f in $RPM_BUILD_ROOT%{_libdir}/smlnj/bin/.heap/sml.*; do
- perl -pi -e "s|\Q$RPM_BUILD_ROOT\E([^\0]*.)|\1$n|" $f
-done
for f in $RPM_BUILD_ROOT%{_libdir}/smlnj/bin/*; do
- sed -i -e "s,$RPM_BUILD_ROOT,," $f
+ sed -i -e "s,$PWD,%{_libdir}/smlnj," $f
ln -sf ${f#$RPM_BUILD_ROOT} $RPM_BUILD_ROOT%{_bindir}
done
for f in $RPM_BUILD_ROOT%{_libdir}/smlnj/bin/.*-sml; do
- sed -i -e "s,$RPM_BUILD_ROOT,," $f
+ sed -i -e "s,$PWD,%{_libdir}/smlnj," $f
done

%files
@@ -71,6 +75,8 @@
%{_libdir}/smlnj

%changelog
+* Thu Oct 30 2008 schwab@xxxxxxx
+- Fix embedded paths.
* Wed Feb 13 2008 schwab@xxxxxxx
- Update to version 110.67.
* Fri Aug 10 2007 schwab@xxxxxxx

++++++ config.diff ++++++
--- /var/tmp/diff_new_pack.V28120/_old 2008-11-03 14:23:41.000000000 +0100
+++ /var/tmp/diff_new_pack.V28120/_new 2008-11-03 14:23:41.000000000 +0100
@@ -1,6 +1,6 @@
--- _arch-n-opsys
+++ _arch-n-opsys
-@@ -93,8 +93,8 @@
+@@ -97,8 +97,8 @@ case `uname -s` in
;;
# As long as we do not natively support the amd64 architecture,
# we should fallback to the x86 compatibility mode. --Stef
@@ -11,9 +11,65 @@
ARCH=ppc
case `uname -r` in
*osfmach*) OPSYS=mklinux ;;
+--- _link-sml
++++ _link-sml
+@@ -21,12 +21,18 @@ unset ENV
+ # the path of the directory in which executables (like this file) are kept.
+ if [ x"$SMLNJ_HOME" = x ] ; then
+ BIN_DIR="@BINDIR@"
++ LIB_DIR="@LIBDIR@"
+ if [ ! -d "$BIN_DIR" ]; then
+ cmddir=`dirname $0`
+ case "$cmddir" in
+ /* ) BIN_DIR="$cmddir";;
+ * ) BIN_DIR=`cd $cmddir; pwd` ;;
+ esac
++ LIB_DIR=`cd $BIN_DIR/../lib; pwd`
++ fi
++ if [ x"$CM_PATHCONFIG" = x ] ; then
++ CM_PATHCONFIG=${LIB_DIR}/pathconfig
++ export CM_PATHCONFIG
+ fi
+ else
+ if [ x"$CM_PATHCONFIG" = x ] ; then
+--- _ml-makedepend
++++ _ml-makedepend
+@@ -2,6 +2,11 @@
+
+ if [ x${SMLNJ_HOME} = x ] ; then
+ BIN_DIR="@BINDIR@"
++ LIB_DIR="@LIBDIR@"
++ if [ x"$CM_PATHCONFIG" = x ] ; then
++ CM_PATHCONFIG=${LIB_DIR}/pathconfig
++ export CM_PATHCONFIG
++ fi
+ else
+ if [ x${CM_PATHCONFIG} = x ] ; then
+ CM_PATHCONFIG=${SMLNJ_HOME}/lib/pathconfig
+--- _run-sml
++++ _run-sml
+@@ -33,12 +33,18 @@ fi
+ # the path of the directory in which executables (like this file) are kept.
+ if [ x"$SMLNJ_HOME" = x ] ; then
+ BIN_DIR="@BINDIR@"
++ LIB_DIR="@LIBDIR@"
+ if [ ! -d "$BIN_DIR" ]; then
+ cmddir=`dirname "$0"`
+ case "$cmddir" in
+ /* ) BIN_DIR="$cmddir";;
+ * ) BIN_DIR=`cd $cmddir; pwd` ;;
+ esac
++ LIB_DIR=`cd $BIN_DIR/../lib; pwd`
++ fi
++ if [ x"$CM_PATHCONFIG" = x ] ; then
++ CM_PATHCONFIG=${LIB_DIR}/pathconfig
++ export CM_PATHCONFIG
+ fi
+ else
+ if [ x"$CM_PATHCONFIG" = x ] ; then
--- install.sh
+++ install.sh
-@@ -318,7 +318,7 @@
+@@ -319,7 +319,7 @@ else
"$CONFIGDIR"/unpack "$ROOT" runtime
cd "$BASEDIR"/runtime/objs
echo $this: Compiling the run-time system.
@@ -24,7 +80,7 @@
if [ -f runx.$ARCH-$OPSYS ]; then
--- preloads
+++ preloads
-@@ -22,13 +22,13 @@
+@@ -22,13 +22,13 @@ autoload $smlnj/smlnj-lib/smlnj-lib.cm
##################### ADDITIONAL LIBRARIES ############################

# The "Pretty-Printing" portion of the SML/NJ library
@@ -43,7 +99,7 @@
################## FOR SML/NJ COMPILER HACKERS ########################
--- targets
+++ targets
-@@ -50,7 +50,7 @@
+@@ -91,7 +91,7 @@ request ml-lpt-lib

# build ML-Burg
#
@@ -52,7 +108,7 @@

# pre-compile and install the remaining components of the SML/NJ library
# (everything except smlnj-lib.cm, aka Util, itself)
-@@ -59,7 +59,7 @@
+@@ -100,7 +100,7 @@ request smlnj-lib

# pre-compile and install CM "portable graph" utility library
#
@@ -61,7 +117,7 @@

# pre-compile and install "Trace-Debug-Profile" utility library
# (provides simple back-trace- and coverage facilities)
-@@ -79,7 +79,7 @@
+@@ -120,7 +120,7 @@ request cml-lib
# pre-compile and install eXene, which is a library for X-Windows programming.
# EXene requires CML.
#
@@ -70,7 +126,7 @@

# pre-compile (certain) parts of MLRISC that are not already part of the
SML/NJ
# compiler itself
-@@ -114,7 +114,7 @@
+@@ -155,7 +155,7 @@ request mlrisc
# This library is for parsing and pretty printing SML code.
# It's used by various MLRISC code generator generator.
#
@@ -79,7 +135,7 @@

# Build and install the 'nowhere' program translator.
# This tool translates programs with conditional patterns (where clauses)
-@@ -122,7 +122,7 @@
+@@ -163,7 +163,7 @@ request mlrisc
# (bad) documentation.
# (Requires the mlrisc-tools library!)
#

++++++ runtime.diff ++++++
--- /var/tmp/diff_new_pack.V28120/_old 2008-11-03 14:23:41.000000000 +0100
+++ /var/tmp/diff_new_pack.V28120/_new 2008-11-03 14:23:41.000000000 +0100
@@ -1,3 +1,13 @@
+--- c-libs/smlnj-date/mktime.c
++++ c-libs/smlnj-date/mktime.c
+@@ -3,6 +3,7 @@
+ * COPYRIGHT (c) 1995 AT&T Bell Laboratories.
+ */
+
++#include <string.h>
+ #include <time.h>
+ #include "ml-base.h"
+ #include "ml-c.h"
--- c-libs/smlnj-runtime/gc-ctl.c
+++ c-libs/smlnj-runtime/gc-ctl.c
@@ -5,6 +5,7 @@
@@ -20,7 +30,7 @@
#include "ml-values.h"
--- gc/heap-in-util.c
+++ gc/heap-in-util.c
-@@ -75,6 +75,7 @@
+@@ -75,6 +75,7 @@ status_t HeapIO_Seek (inbuf_t *bp, long
if (fseek (bp->file, offset, SEEK_SET) != 0)
Die ("unable to seek on heap image\n");
bp->nbytes = 0; /* just in case? */
@@ -72,7 +82,7 @@
# define TEXT .text
--- include/ml-base.h
+++ include/ml-base.h
-@@ -149,8 +149,16 @@
+@@ -149,8 +149,16 @@ typedef struct { /* a table of system co
extern void Say (char *fmt, ...);
extern void SayDebug (char *fmt, ...);
extern void Error (char *, ...);

++++++ smlnj-110.67.tar.bz2 -> smlnj-110.68.tar.bz2 ++++++
arch/i386/smlnj/smlnj-110.67.tar.bz2
/mounts/work_src_done/STABLE/smlnj/smlnj-110.68.tar.bz2 differ: byte 11, line 1


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages