From 645432c946ea32ac85a517f249e84a81c102b487 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 13 Oct 1999 19:03:38 +0000 Subject: * teach SmallEiffel that -Wl,option is a linker flag for gcc; * bootstrap compile SmallEiffel with optimizations on; * some corrections to default loadpath.UNIX; * point users at correct documentation files in error messages. --- lang/smalleiffel/Makefile | 20 ++++++++++++-------- lang/smalleiffel/files/loadpath.UNIX | 4 ---- lang/smalleiffel/files/loadpath.UNIX.in | 5 +++++ lang/smalleiffel/files/patch-sum | 7 ++++--- lang/smalleiffel/files/smalleiffel.sh | 14 +++++++++----- lang/smalleiffel/patches/patch-aa | 12 ++++++++++-- lang/smalleiffel/patches/patch-ab | 24 ++++++++++++++++++++++-- lang/smalleiffel/patches/patch-ac | 13 +++++++++++++ 8 files changed, 75 insertions(+), 24 deletions(-) delete mode 100644 lang/smalleiffel/files/loadpath.UNIX create mode 100644 lang/smalleiffel/files/loadpath.UNIX.in create mode 100644 lang/smalleiffel/patches/patch-ac diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile index 1c09bce3049..f9585360cd0 100644 --- a/lang/smalleiffel/Makefile +++ b/lang/smalleiffel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 1999/10/12 08:01:33 jlam Exp $ +# $NetBSD: Makefile,v 1.4 1999/10/13 19:03:38 jlam Exp $ # DISTNAME= se @@ -29,11 +29,9 @@ post-extract: cd ${WRKSRC}/man; ${RM} -f *.txt cd ${WRKSRC}/sys; ${RM} -f compiler.se gc loadpath.* system.se cd ${FILESDIR}; \ - ${CP} -f compiler.se gc loadpath.UNIX system.se ${WRKSRC}/sys - -post-patch: - cd ${WRKSRC}/lib_se; \ - ${RM} -f frozen_string_list.e.orig system_tools.e.orig + ${CP} -f compiler.se gc system.se ${WRKSRC}/sys + ${SED} -e "s,@@SE_LIB@@,${LIBDIR},g" \ + ${FILESDIR}/loadpath.UNIX.in > ${WRKSRC}/sys/loadpath.UNIX do-build: @${ECHO} '*** Building Eiffel compiler system (pass 1) ***' @@ -47,10 +45,13 @@ do-build: @${ECHO} '*** Building Eiffel compiler system (pass 2) ***' @cd ${WRKSRC}/bin_c; \ + (${ECHO} ${WRKSRC}/lib_std/; \ + ${ECHO} ${WRKSRC}/lib_rand/; \ + ${ECHO} ${WRKSRC}/lib_se/) > loadpath.se; \ for file in ${SE_BINARIES}; do \ ${ECHO} Building $$file...; \ - SMALLEIFFEL=${WRKSRC} SmallEiffel=${WRKSRC}/sys/system.se \ - ../bin/compile -boost -no_split -o $$file $$file; \ + SmallEiffel=${WRKSRC}/sys/system.se ${WRKSRC}/bin/compile \ + -boost -no_gc -no_split -O2 -o $$file $$file; \ done post-build: @@ -58,6 +59,9 @@ post-build: -e "s,@@SE_LIBEXEC@@,${LIBEXECDIR},g" \ ${FILESDIR}/${BINNAME}.sh > ${WRKDIR}/${BINNAME}.sh +pre-install: + find ${WRKSRC} -name "*.orig" -print | xargs ${RM} -f + do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME} ${INSTALL_PROGRAM_DIR} ${LIBEXECDIR} diff --git a/lang/smalleiffel/files/loadpath.UNIX b/lang/smalleiffel/files/loadpath.UNIX deleted file mode 100644 index b9262a3691d..00000000000 --- a/lang/smalleiffel/files/loadpath.UNIX +++ /dev/null @@ -1,4 +0,0 @@ -${SMALLEIFFEL}/lib_std/ -${SMALLEIFFEL}/lib_rand/ -${SMALLEIFFEL}/lib_show/ -${SMALLEIFFEL}/lib_se/ diff --git a/lang/smalleiffel/files/loadpath.UNIX.in b/lang/smalleiffel/files/loadpath.UNIX.in new file mode 100644 index 00000000000..d349cab6758 --- /dev/null +++ b/lang/smalleiffel/files/loadpath.UNIX.in @@ -0,0 +1,5 @@ +-- $NetBSD: loadpath.UNIX.in,v 1.1 1999/10/13 19:03:39 jlam Exp $ +-- +@@SE_LIB@@/lib_std/ +@@SE_LIB@@/lib_rand/ +@@SE_LIB@@/lib_se/ diff --git a/lang/smalleiffel/files/patch-sum b/lang/smalleiffel/files/patch-sum index 15aaea31867..830f62e5a25 100644 --- a/lang/smalleiffel/files/patch-sum +++ b/lang/smalleiffel/files/patch-sum @@ -1,4 +1,5 @@ -$NetBSD: patch-sum,v 1.1 1999/10/12 08:01:33 jlam Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/13 19:03:39 jlam Exp $ -MD5 (patch-aa) = 3c747a451b17b116bdf5a16e68a3a0fb -MD5 (patch-ab) = 99935df366c8a24e4569e969a356c209 +MD5 (patch-aa) = 8c4d2e4256c0a148906d30ab2f7b48fe +MD5 (patch-ab) = 43b7f0fac9666bfb83b8f1d50b81a7ad +MD5 (patch-ac) = f0d2fb0bb3f407a387a1ab9bc7ba96b6 diff --git a/lang/smalleiffel/files/smalleiffel.sh b/lang/smalleiffel/files/smalleiffel.sh index 577731ed9e2..7fce43f85e7 100644 --- a/lang/smalleiffel/files/smalleiffel.sh +++ b/lang/smalleiffel/files/smalleiffel.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: smalleiffel.sh,v 1.3 1999/10/12 08:01:33 jlam Exp $ +# $NetBSD: smalleiffel.sh,v 1.4 1999/10/13 19:03:39 jlam Exp $ # # This script is invoked as: # @@ -8,16 +8,20 @@ # # where is one of the programs in @@SE_LIBEXEC@@. # -SMALLEIFFEL=@@SE_LIB@@; export SMALLEIFFEL -SmallEiffel=${SMALLEIFFEL}/sys/system.se; export SmallEiffel +SmallEiffel=@@SE_LIB@@/sys/system.se; export SmallEiffel se_cmd=@@SE_LIBEXEC@@/$1 shift -# Load the personal SmallEiffel environment from ${HOME}/.smalleiffelrc. +# Load the local SmallEiffel environment from: +# ./.smalleiffelrc, or else +# ${HOME}/.smalleiffelrc. # This file is the right place to define new environment variables used # by 3rd-party libraries, e.g. GOBO=/usr/pkg/share/gobo-eiffel. # -if [ -f ${HOME}/.smalleiffelrc ] +if [ -f ./.smalleiffelrc ] +then + . ./.smalleiffelrc +elif [ -f ${HOME}/.smalleiffelrc ] then . ${HOME}/.smalleiffelrc fi diff --git a/lang/smalleiffel/patches/patch-aa b/lang/smalleiffel/patches/patch-aa index ca59c5ce053..3a5b1aaa95b 100644 --- a/lang/smalleiffel/patches/patch-aa +++ b/lang/smalleiffel/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1 1999/10/12 08:01:33 jlam Exp $ +$NetBSD: patch-aa,v 1.2 1999/10/13 19:03:39 jlam Exp $ --- lib_se/frozen_string_list.e.orig Sat Jun 5 14:51:11 1999 -+++ lib_se/frozen_string_list.e Mon Jun 28 04:00:01 1999 ++++ lib_se/frozen_string_list.e Wed Oct 13 05:10:40 1999 @@ -111,7 +111,7 @@ ----------------------------------------------------------------------------- -- Frozen list of other names : @@ -11,3 +11,11 @@ $NetBSD: patch-aa,v 1.1 1999/10/12 08:01:33 jlam Exp $ fz_bit_foo: STRING is "BIT "; fz_char: STRING is "char"; fz_close_c_comment: STRING is "*/"; +@@ -148,6 +148,7 @@ + fz_java_lang_object: STRING is "java/lang/Object"; + fz_jvm_root: STRING is "_any" + fz_main: STRING is "main"; ++ fz_man: STRING is "doc/smalleiffel"; + fz_new: STRING is "new"; + fz_new_chunk: STRING is "new_chunk"; + fz_null: STRING is "NULL"; diff --git a/lang/smalleiffel/patches/patch-ab b/lang/smalleiffel/patches/patch-ab index a972e7c73ba..3ddec0f0559 100644 --- a/lang/smalleiffel/patches/patch-ab +++ b/lang/smalleiffel/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1 1999/10/12 08:01:34 jlam Exp $ +$NetBSD: patch-ab,v 1.2 1999/10/13 19:03:39 jlam Exp $ --- lib_se/system_tools.e.orig Sat Jun 5 14:51:08 1999 -+++ lib_se/system_tools.e Mon Jun 28 04:05:27 1999 ++++ lib_se/system_tools.e Wed Oct 13 05:27:52 1999 @@ -211,6 +211,8 @@ tmp_file_read.disconnect; bin_directory := sys_directory.twin; @@ -11,3 +11,23 @@ $NetBSD: patch-ab,v 1.1 1999/10/12 08:01:34 jlam Exp $ add_directory(bin_directory,fz_bin); end; +@@ -359,7 +361,8 @@ + echo.w_put_string("'.%N"); + tmp_path.copy(sys_directory); + parent_directory(tmp_path); +- add_directory(tmp_path,"man"); ++ parent_directory(tmp_path); ++ add_directory(tmp_path,fz_man); + tmp_path.append(command_name); + tmp_path.append(help_suffix); + echo.w_put_string("See documentation in file:%N "); +@@ -527,6 +530,9 @@ + else + Result := argi + 1; + end; ++ elseif arg.has_prefix("-Wl,") then ++ list_add(linker_options,arg); ++ Result := argi + 1; + elseif ("-subsystem").is_equal(arg) then + list_add(linker_options,arg); + if next_arg /= Void then diff --git a/lang/smalleiffel/patches/patch-ac b/lang/smalleiffel/patches/patch-ac new file mode 100644 index 00000000000..4a632709656 --- /dev/null +++ b/lang/smalleiffel/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 1999/10/13 19:03:39 jlam Exp $ + +--- lib_se/globals.e.orig Sat Jun 5 14:51:02 1999 ++++ lib_se/globals.e Wed Oct 13 06:13:22 1999 +@@ -460,7 +460,7 @@ + backup_suffix: STRING is ".bak"; + -- Backup suffix for command `pretty'. + +- help_suffix: STRING is ".txt"; ++ help_suffix: STRING is ".html"; + -- Suffix for SmallEiffel On-line Help Files. + + class_suffix: STRING is ".class"; -- cgit v1.2.3