| 1 |
HI! |
| 2 |
I'm from Russia and I speak English so so.... |
| 3 |
I saw your ebuild for suh-j2sdk-1.4.1, |
| 4 |
and my ebuild and patches differ from your. |
| 5 |
|
| 6 |
sun-j2sdk-1.4.1.ebuild: |
| 7 |
|
| 8 |
|
| 9 |
# Copyright 1999-2001 Gentoo Technologies, Inc. |
| 10 |
# Distributed under the terms of the GNU General Public License v2 # |
| 11 |
Maintainer: Stefan Jones <cretin@g.o> |
| 12 |
# Author: Stefan Jones <cretin@g.o> |
| 13 |
# $Header: |
| 14 |
/home/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r2.ebuild,v |
| 15 |
1.4 2002/12/09 04:20:57 manson Exp $ |
| 16 |
|
| 17 |
# Based on http://tushar.lfsforum.org/javafromscratch.txt (LFS) |
| 18 |
# By Tushar Teredesai <Tush@×××××.Com> |
| 19 |
|
| 20 |
IUSE="" |
| 21 |
|
| 22 |
inherit java |
| 23 |
|
| 24 |
JAVA_PATCHES="sun-j2sdk-1.4.1-gcc3-syntax.patch.bz2 |
| 25 |
sun-j2sdk-1.4.1-fix-intl-files.patch.bz2 |
| 26 |
sun-j2sdk-1.4.1-makefiles.patch.bz2" |
| 27 |
|
| 28 |
S=${WORKDIR}/j2sdk |
| 29 |
|
| 30 |
SRC_JAVA="j2sdk-1_4_1-src-scsl.zip" |
| 31 |
SRC_MOZHEADERS="j2sdk-1_4_1-mozilla_headers-unix.zip" |
| 32 |
|
| 33 |
DESCRIPTION="Sun's J2SE Development Kit, version 1.4.0" |
| 34 |
HOMEPAGE="http://wwws.sun.com/software/java2/download.html" |
| 35 |
|
| 36 |
SLOT="0" |
| 37 |
KEYWORDS="x86 -ppc -alpha -sparc " |
| 38 |
LICENSE="sun-csl" |
| 39 |
|
| 40 |
RDEPEND="virtual/glibc |
| 41 |
virtual/x11 |
| 42 |
>=dev-java/java-config-0.1.3" |
| 43 |
DEPEND="${RDEPEND} |
| 44 |
app-arch/zip |
| 45 |
app-arch/unzip |
| 46 |
>=virtual/jdk-1.4 |
| 47 |
!x11-libs/openmotif |
| 48 |
!x11-libs/lesstif" |
| 49 |
|
| 50 |
PROVIDE="virtual/jre-1.4.0 |
| 51 |
virtual/jdk-1.4.0 |
| 52 |
virtual/java-scheme-2" |
| 53 |
|
| 54 |
pkg_setup() { |
| 55 |
#Check if we have enough space |
| 56 |
if [ `df ${PORTAGE_TMPDIR}/portage/ | tail -n 1 | awk '{ print $4 }'` -le |
| 57 |
2097152 ] ; then |
| 58 |
eerror "You need about 2G of disk space to compile this at |
| 59 |
${PORTAGE_TMPDIR}/portage," |
| 60 |
eerror "it seems you don't have that much, quiting, sorry!" |
| 61 |
die "Not enough disk space" |
| 62 |
fi |
| 63 |
|
| 64 |
#Check the Current java-version ~ 1.4 and is jdk |
| 65 |
JAVAC=`java-config --javac` |
| 66 |
if [ -z $JAVAC ] ; then |
| 67 |
eerror "Set java-config to use a jdk not a jre" |
| 68 |
die "The version of java set by java-config doesn't contain javac" |
| 69 |
fi |
| 70 |
|
| 71 |
if [ `java-config --java-version 2>&1 | grep "1\.4\." | wc -l` -lt 1 ] |
| 72 |
; then |
| 73 |
eerror "JDK is too old, >= 1.4 is required" |
| 74 |
die "The version of jdk pointed to by java-config is not >=1.4" |
| 75 |
fi |
| 76 |
|
| 77 |
} |
| 78 |
|
| 79 |
src_unpack() { |
| 80 |
die_flag="" |
| 81 |
if [ ! -f ${DISTDIR}/${SRC_MOZHEADERS} ] ; then |
| 82 |
eerror "Please download ${SRC_MOZHEADERS} from ${HOMEPAGE} to |
| 83 |
${DISTDIR}" |
| 84 |
die_flag=1 |
| 85 |
fi |
| 86 |
|
| 87 |
if [ ! -f ${DISTDIR}/${SRC_JAVA} ] ; then |
| 88 |
eerror "Please download ${SRC_JAVA} from ${HOMEPAGE} to ${DISTDIR}" |
| 89 |
die_flag=1 |
| 90 |
fi |
| 91 |
|
| 92 |
[ ! -z ${die_flag} ] && die "Some source files were not found" |
| 93 |
|
| 94 |
mkdir ${S} |
| 95 |
cd ${S} |
| 96 |
unpack ${SRC_JAVA} |
| 97 |
|
| 98 |
mkdir mozilla |
| 99 |
cd mozilla |
| 100 |
unpack ${SRC_MOZHEADERS} |
| 101 |
|
| 102 |
cd ${S} |
| 103 |
for patch in $JAVA_PATCHES ; do |
| 104 |
bzip2 -dc ${FILESDIR}/patches/${patch} | patch -p1 || die "Failed to |
| 105 |
apply ${patch}" |
| 106 |
done |
| 107 |
|
| 108 |
} |
| 109 |
|
| 110 |
src_compile () { |
| 111 |
cd ${S} |
| 112 |
unset CLASSPATH JAVA_HOME JAVAC |
| 113 |
|
| 114 |
# Otherwise the command: |
| 115 |
# (cd |
| 116 |
/var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2re-image; |
| 117 |
tar cf - .) | \ |
| 118 |
# (cd |
| 119 |
/var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2sdk-image/jre; |
| 120 |
tar xf -) |
| 121 |
# Will fail, you have been warned!!!! There are NO sandbox violations |
| 122 |
anyway LD_PRELOAD_SAVE=$LD_PRELOAD |
| 123 |
unset LD_PRELOAD |
| 124 |
|
| 125 |
# Any CFLAGS will cause the build to fail! |
| 126 |
# If you don't believe me ... |
| 127 |
export OTHER_CFLAGS="-march=i686 -formit-frame-pointer -s" |
| 128 |
export OTHER_CXXFLAGS="-march=i686 -formit-frame-pointer -s" |
| 129 |
#export OTHER_CFLAGS=${CFLAGS} |
| 130 |
#export OTHER_CXXFLAGS=${CXXFLAGS} |
| 131 |
unset CFLAGS CXXFLAGS |
| 132 |
|
| 133 |
export ALT_MOZILLA_PATH="${S}/mozilla" |
| 134 |
export ALT_BOOTDIR=`java-config --jdk-home` |
| 135 |
export ALT_MOTIF_DIR="${S}/motif" |
| 136 |
export ALT_DEVTOOLS_PATH="/usr/bin" |
| 137 |
export MILESTONE="gentoo" |
| 138 |
export BUILD_NUMBER=`date +%s` |
| 139 |
export INSANE=true |
| 140 |
export MAKE_VERBOSE=true |
| 141 |
export OTHER_LDFLAGS="-lpthread" |
| 142 |
export DEV_ONLY=true |
| 143 |
|
| 144 |
cd ${S}/control/make |
| 145 |
|
| 146 |
gmake all || die |
| 147 |
} |
| 148 |
|
| 149 |
src_install () { |
| 150 |
dodir /opt/${P} |
| 151 |
|
| 152 |
cd ${S}/control/build/linux-*/j2sdk-image |
| 153 |
local dirs="bin include jre lib" |
| 154 |
dodir /opt/${P} |
| 155 |
|
| 156 |
for i in $dirs ; do |
| 157 |
cp -a $i ${D}/opt/${P}/ |
| 158 |
done |
| 159 |
|
| 160 |
dodoc COPYRIGHT README LICENSE |
| 161 |
dohtml README.html |
| 162 |
|
| 163 |
doman man/man1/*.1 |
| 164 |
|
| 165 |
dodir /opt/${P}/share/ |
| 166 |
cp -a demo src.zip ${D}/opt/${P}/share/ |
| 167 |
|
| 168 |
if [ "`use mozilla`" ] ; then |
| 169 |
dodir /usr/lib/mozilla/plugins |
| 170 |
dosym /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so |
| 171 |
/usr/lib/mozilla/plugins/ |
| 172 |
fi |
| 173 |
|
| 174 |
set_java_env ${FILESDIR}/${VMHANDLE} |
| 175 |
|
| 176 |
} |
| 177 |
|
| 178 |
pkg_postinst () { |
| 179 |
# Set as default VM if none exists |
| 180 |
java_pkg_postinst |
| 181 |
|
| 182 |
if [ "`use mozilla`" ] ; then |
| 183 |
einfo "The Mozilla browser plugin has been installed as |
| 184 |
/usr/lib/mozilla/plugins/libjavaplugin_oji.so" |
| 185 |
else |
| 186 |
einfo "To install the Java plugin for Mozilla manually, do:" |
| 187 |
einfo "ln -s /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so |
| 188 |
/usr/lib/mozilla/plugins/" |
| 189 |
einfo "(Make certain the directory /usr/lib/mozilla/plugins exists first)" |
| 190 |
fi |
| 191 |
} |
| 192 |
|
| 193 |
|
| 194 |
sun-j2sdk-1.4.0-fix-intl-files.patch.bz2 is the same. |
| 195 |
|
| 196 |
sun-j2sdk-1.4.1-gcc3-syntax.patch : |
| 197 |
|
| 198 |
--- sun-j2sdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp.orig 2002-09-06 |
| 199 |
11:03:41.000000000 +0400 |
| 200 |
+++ sun-j2sdk/hotspot/src/share/vm/c1/c1_FrameMap.hpp 2003-01-10 |
| 201 |
02:32:31.000000000 +0300 |
| 202 |
@@ -196,7 +196,7 @@ |
| 203 |
//-------------------------------------------------------- |
| 204 |
|
| 205 |
class ArgumentLocation VALUE_OBJ_CLASS_SPEC { |
| 206 |
- friend CallingConvention; |
| 207 |
+ friend struct CallingConvention; |
| 208 |
private: |
| 209 |
int _n; // either a register number 0-5 (I0-I5 or O0-O5), or an |
| 210 |
offset (in words) from SP/FP |
| 211 |
|
| 212 |
@@ -246,7 +246,7 @@ |
| 213 |
//-------------------------------------------------------- |
| 214 |
|
| 215 |
class CallingConvention: public ResourceObj { |
| 216 |
- friend FrameMap; |
| 217 |
+ friend class FrameMap; |
| 218 |
|
| 219 |
private: |
| 220 |
intStack* _args; |
| 221 |
|
| 222 |
|
| 223 |
--- sun-j2sdk/hotspot/src/share/vm/opto/loopnode.hpp.orig 2002-09-06 |
| 224 |
11:04:33.000000000 +0400 |
| 225 |
+++ sun-j2sdk/hotspot/src/share/vm/opto/loopnode.hpp 2003-01-10 |
| 226 |
02:31:06.000000000 +0300 |
| 227 |
@@ -308,7 +308,7 @@ |
| 228 |
// Computes the mapping from Nodes to IdealLoopTrees. Organizes |
| 229 |
IdealLoopTrees into a |
| 230 |
// loop tree. Drives the loop-based transformations on the ideal graph. |
| 231 |
class PhaseIdealLoop : public PhaseTransform { |
| 232 |
- friend IdealLoopTree; |
| 233 |
+ friend class IdealLoopTree; |
| 234 |
// Pre-computed def-use info |
| 235 |
PhaseIterGVN &_igvn; |
| 236 |
|
| 237 |
--- sun-j2sdk/hotspot/src/os/linux/vm/jsig.c.orig 2003-01-11 |
| 238 |
09:50:20.000000000 +0300 |
| 239 |
+++ sun-j2sdk/hotspot/src/os/linux/vm/jsig.c 2003-01-11 09:51:40.000000000 |
| 240 |
+0300 |
| 241 |
@@ -17,6 +17,8 @@ |
| 242 |
#include <signal.h> |
| 243 |
#include <dlfcn.h> |
| 244 |
#include <pthread.h> |
| 245 |
+#include <stdlib.h> |
| 246 |
+#include <stdio.h> |
| 247 |
|
| 248 |
#define bool int |
| 249 |
#define true 1 |
| 250 |
|
| 251 |
|
| 252 |
--- |
| 253 |
sun-j2sdk/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c.orig 2003-01-11 |
| 254 |
21:11:09.000000000 +0300 |
| 255 |
+++ |
| 256 |
sun-j2sdk/j2se/ext/plugin/oji-plugin/src/motif/common/utils.c 2003-01-11 |
| 257 |
21:11:27.000000000 +0300 |
| 258 |
@@ -11,6 +11,7 @@ |
| 259 |
#include <sys/socket.h> |
| 260 |
#include <locale.h> |
| 261 |
#include <errno.h> |
| 262 |
+#include <string.h> |
| 263 |
#include <strings.h> |
| 264 |
#include <dlfcn.h> |
| 265 |
#include "plugin_defs.h" |
| 266 |
|
| 267 |
|
| 268 |
sun-j2sdk-1.4.1-makefiles.patch : |
| 269 |
|
| 270 |
|
| 271 |
--- sun-j2sdk/control/make/common/Defs-linux.gmk 2002-09-06 |
| 272 |
00:00:00.000000000 +0400 |
| 273 |
+++ sun-j2sdk/control/make/common/Defs-linux.gmk.orig 2003-01-10 |
| 274 |
17:18:07.000000000 +0300 |
| 275 |
@@ -44,52 +44,54 @@ |
| 276 |
# define these to avoid picking up ones from aliases or from |
| 277 |
# non-standard locations |
| 278 |
# |
| 279 |
+# It is more appropriate to honor the user's path; removing fixed paths. |
| 280 |
+# --Tushar <tush@×××××.com> |
| 281 |
|
| 282 |
-AR = $(USRBIN_PATH)ar |
| 283 |
-BASENAME = $(UNIXCOMMAND_PATH)basename |
| 284 |
-CAT = $(UNIXCOMMAND_PATH)cat |
| 285 |
+AR = ar |
| 286 |
+BASENAME = basename |
| 287 |
+CAT = cat |
| 288 |
CD = cd # intrinsic unix command |
| 289 |
-CHMOD = $(UNIXCOMMAND_PATH)chmod |
| 290 |
-CMP = $(USRBIN_PATH)cmp |
| 291 |
-COMM = $(USRBIN_PATH)comm |
| 292 |
-COMPRESS = $(USRBIN_PATH)compress |
| 293 |
-CP = $(UNIXCOMMAND_PATH)cp |
| 294 |
-CPIO = $(UNIXCOMMAND_PATH)cpio |
| 295 |
-CUT = $(USRBIN_PATH)cut |
| 296 |
-DATE = $(UNIXCOMMAND_PATH)date |
| 297 |
-DF = $(UNIXCOMMAND_PATH)df |
| 298 |
-DIFF = $(USRBIN_PATH)diff |
| 299 |
-DIRNAME = $(USRBIN_PATH)dirname |
| 300 |
+CHMOD = chmod |
| 301 |
+CMP = cmp |
| 302 |
+COMM = comm |
| 303 |
+COMPRESS = compress |
| 304 |
+CP = cp |
| 305 |
+CPIO = cpio |
| 306 |
+CUT = cut |
| 307 |
+DATE = date |
| 308 |
+DF = df |
| 309 |
+DIFF = diff |
| 310 |
+DIRNAME = dirname |
| 311 |
ECHO = echo -e # intrinsic unix command, with backslash-escaped |
| 312 |
character interpretation |
| 313 |
-EGREP = $(UNIXCOMMAND_PATH)egrep |
| 314 |
-EXPR = $(USRBIN_PATH)expr |
| 315 |
-FIND = $(USRBIN_PATH)find |
| 316 |
-GREP = $(UNIXCOMMAND_PATH)grep |
| 317 |
-LEX = $(USRBIN_PATH)lex |
| 318 |
-LN = $(UNIXCOMMAND_PATH)ln |
| 319 |
-LS = $(UNIXCOMMAND_PATH)ls |
| 320 |
-M4 = $(USRBIN_PATH)m4 |
| 321 |
-MKDIR = $(UNIXCOMMAND_PATH)mkdir |
| 322 |
-MV = $(UNIXCOMMAND_PATH)mv |
| 323 |
-NAWK = $(USRBIN_PATH)gawk |
| 324 |
-PWD = $(UNIXCOMMAND_PATH)pwd |
| 325 |
+EGREP = egrep |
| 326 |
+EXPR = expr |
| 327 |
+FIND = find |
| 328 |
+GREP = grep |
| 329 |
+LEX = lex |
| 330 |
+LN = ln |
| 331 |
+LS = ls |
| 332 |
+M4 = m4 |
| 333 |
+MKDIR = mkdir |
| 334 |
+MV = mv |
| 335 |
+NAWK = gawk |
| 336 |
+PWD = pwd |
| 337 |
#RM is defined by GNU Make as 'rm -f' |
| 338 |
-RMDIR = $(UNIXCOMMAND_PATH)rmdir |
| 339 |
-RPM = $(UNIXCOMMAND_PATH)rpm |
| 340 |
-SED = $(UNIXCOMMAND_PATH)sed |
| 341 |
-SH = $(UNIXCOMMAND_PATH)sh |
| 342 |
-SORT = $(UNIXCOMMAND_PATH)sort |
| 343 |
-STRIP = $(USRBIN_PATH)strip |
| 344 |
-TAR = $(UNIXCOMMAND_PATH)tar |
| 345 |
-TOUCH = $(UNIXCOMMAND_PATH)touch |
| 346 |
-TR = $(USRBIN_PATH)tr |
| 347 |
-TRUE = $(UNIXCOMMAND_PATH)true |
| 348 |
-UNAME = $(UNIXCOMMAND_PATH)uname |
| 349 |
-UNIQ = $(USRBIN_PATH)uniq |
| 350 |
-UNZIP = $(USRBIN_PATH)unzip |
| 351 |
-WC = $(USRBIN_PATH)wc |
| 352 |
-YACC = $(USRBIN_PATH)yacc |
| 353 |
-ZIPEXE = $(USRBIN_PATH)zip |
| 354 |
+RMDIR = rmdir |
| 355 |
+RPM = rpm |
| 356 |
+SED = sed |
| 357 |
+SH = sh |
| 358 |
+SORT = sort |
| 359 |
+STRIP = strip |
| 360 |
+TAR = tar |
| 361 |
+TOUCH = touch |
| 362 |
+TR = tr |
| 363 |
+TRUE = true |
| 364 |
+UNAME = uname |
| 365 |
+UNIQ = uniq |
| 366 |
+UNZIP = unzip |
| 367 |
+WC = wc |
| 368 |
+YACC = yacc |
| 369 |
+ZIPEXE = zip |
| 370 |
|
| 371 |
|
| 372 |
archExpr = case "`$(UNAME) -m`" in \ |
| 373 |
--- sun-j2sdk/j2se/make/common/Defs-linux.gmk.orig 2003-01-10 |
| 374 |
17:26:53.000000000 +0300 |
| 375 |
+++ sun-j2sdk/j2se/make/common/Defs-linux.gmk 2003-01-10 |
| 376 |
17:30:10.000000000 +0300 |
| 377 |
@@ -26,55 +26,55 @@ |
| 378 |
# non-standard locations |
| 379 |
# |
| 380 |
|
| 381 |
-AR = $(USRBIN_PATH)ar |
| 382 |
-BASENAME = $(UNIXCOMMAND_PATH)basename |
| 383 |
-CAT = $(UNIXCOMMAND_PATH)cat |
| 384 |
-CC = $(COMPILER_PATH)gcc |
| 385 |
-CPP = $(COMPILER_PATH)gcc -E |
| 386 |
-CXX = $(COMPILER_PATH)g++ |
| 387 |
+AR = ar |
| 388 |
+BASENAME = basename |
| 389 |
+CAT = cat |
| 390 |
+CC = gcc |
| 391 |
+CPP = gcc -E |
| 392 |
+CXX = g++ |
| 393 |
CD = cd # intrinsic unix command |
| 394 |
-CHMOD = $(UNIXCOMMAND_PATH)chmod |
| 395 |
-CMP = $(USRBIN_PATH)cmp |
| 396 |
-COMPRESS = $(USRBIN_PATH)compress |
| 397 |
-CP = $(UNIXCOMMAND_PATH)cp |
| 398 |
-CPIO = $(UNIXCOMMAND_PATH)cpio |
| 399 |
-CUT = $(USRBIN_PATH)cut |
| 400 |
-DATE = $(UNIXCOMMAND_PATH)date |
| 401 |
-DF = $(UNIXCOMMAND_PATH)df |
| 402 |
-DIFF = $(USRBIN_PATH)diff |
| 403 |
-DIRNAME = $(USRBIN_PATH)dirname |
| 404 |
+CHMOD = chmod |
| 405 |
+CMP = cmp |
| 406 |
+COMPRESS = compress |
| 407 |
+CP = cp |
| 408 |
+CPIO = cpio |
| 409 |
+CUT = )cut |
| 410 |
+DATE = date |
| 411 |
+DF = df |
| 412 |
+DIFF = diff |
| 413 |
+DIRNAME = dirname |
| 414 |
ECHO = echo -e # intrinsic unix command, with backslash-escaped |
| 415 |
character interpretation |
| 416 |
-EGREP = $(UNIXCOMMAND_PATH)egrep |
| 417 |
-EXPR = $(USRBIN_PATH)expr |
| 418 |
-FIND = $(USRBIN_PATH)find |
| 419 |
-HEAD = $(USRBIN_PATH)head |
| 420 |
-GDB = $(USRBIN_PATH)gdb |
| 421 |
-GREP = $(UNIXCOMMAND_PATH)grep |
| 422 |
-LEX = $(USRBIN_PATH)lex |
| 423 |
-LN = $(UNIXCOMMAND_PATH)ln |
| 424 |
-LS = $(UNIXCOMMAND_PATH)ls |
| 425 |
-M4 = $(USRBIN_PATH)m4 |
| 426 |
-MKDIR = $(UNIXCOMMAND_PATH)mkdir |
| 427 |
-MV = $(UNIXCOMMAND_PATH)mv |
| 428 |
-NAWK = $(USRBIN_PATH)gawk |
| 429 |
-PWD = $(UNIXCOMMAND_PATH)pwd |
| 430 |
+EGREP = egrep |
| 431 |
+EXPR = expr |
| 432 |
+FIND = find |
| 433 |
+HEAD = head |
| 434 |
+GDB = gdb |
| 435 |
+GREP = grep |
| 436 |
+LEX = lex |
| 437 |
+LN = ln |
| 438 |
+LS = ls |
| 439 |
+M4 = m4 |
| 440 |
+MKDIR = mkdir |
| 441 |
+MV = mv |
| 442 |
+NAWK = gawk |
| 443 |
+PWD = pwd |
| 444 |
#RM is defined by GNU Make as 'rm -f' |
| 445 |
-RMDIR = $(UNIXCOMMAND_PATH)rmdir |
| 446 |
-RPM = $(UNIXCOMMAND_PATH)rpm |
| 447 |
-SED = $(UNIXCOMMAND_PATH)sed |
| 448 |
-SH = $(UNIXCOMMAND_PATH)sh |
| 449 |
-SORT = $(UNIXCOMMAND_PATH)sort |
| 450 |
-STRIP = $(USRBIN_PATH)strip |
| 451 |
-TAR = $(UNIXCOMMAND_PATH)tar |
| 452 |
-TOUCH = $(UNIXCOMMAND_PATH)touch |
| 453 |
-TR = $(USRBIN_PATH)tr |
| 454 |
-TRUE = $(UNIXCOMMAND_PATH)true |
| 455 |
-UNAME = $(UNIXCOMMAND_PATH)uname |
| 456 |
-UNIQ = $(USRBIN_PATH)uniq |
| 457 |
-UNZIP = $(USRBIN_PATH)unzip |
| 458 |
-UNZIPSFX = $(USRBIN_PATH)unzipsfx |
| 459 |
-YACC = $(USRBIN_PATH)yacc |
| 460 |
-ZIPEXE = $(USRBIN_PATH)zip |
| 461 |
+RMDIR = rmdir |
| 462 |
+RPM = rpm |
| 463 |
+SED = sed |
| 464 |
+SH = sh |
| 465 |
+SORT = sort |
| 466 |
+STRIP = strip |
| 467 |
+TAR = tar |
| 468 |
+TOUCH = touch |
| 469 |
+TR = tr |
| 470 |
+TRUE = true |
| 471 |
+UNAME = uname |
| 472 |
+UNIQ = uniq |
| 473 |
+UNZIP = unzip |
| 474 |
+UNZIPSFX = unzipsfx |
| 475 |
+YACC = yacc |
| 476 |
+ZIPEXE = zip |
| 477 |
|
| 478 |
|
| 479 |
archExpr = case "`$(UNAME) -m`" in \ |
| 480 |
--- sun-j2sdk/hotspot/build/linux/makefiles/vm.make.orig 2003-01-11 |
| 481 |
13:26:54.000000000 +0300 |
| 482 |
+++ sun-j2sdk/hotspot/build/linux/makefiles/vm.make 2003-01-11 |
| 483 |
13:28:27.000000000 +0300 |
| 484 |
@@ -73,9 +73,9 @@ |
| 485 |
# do not include shared lib path in a.outs |
| 486 |
#AOUT_FLAGS += -norunpath |
| 487 |
|
| 488 |
-COMPILE = ${CPP} ${CPPFLAGS} ${CFLAGS} |
| 489 |
-LINK_LIB = ${CPP} -shared -mimpure-text |
| 490 |
-LINK = ${CPP} ${AOUT_FLAGS} |
| 491 |
+COMPILE = ${CXX} ${CPPFLAGS} ${CFLAGS} |
| 492 |
+LINK_LIB = ${CXX} -shared -mimpure-text |
| 493 |
+LINK = ${CXX} ${AOUT_FLAGS} |
| 494 |
|
| 495 |
|
| 496 |
COMPILE.s = ${COMPILE} -S |
| 497 |
@@ -209,6 +209,6 @@ |
| 498 |
|
| 499 |
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c |
| 500 |
echo Making signal interposition lib...; \ |
| 501 |
- $(CC) $(SYMFLAG) -D_GNU_SOURCE -D_REENTRANT -shared -fPIC -o $@ |
| 502 |
$(JSIGSRCDIR)/jsig.c -ldl |
| 503 |
+ $(CC) $(SYMFLAG) -D_GNU_SOURCE -D_REENTRANT -shared -fPIC -o $@ |
| 504 |
$(JSIGSRCDIR)/jsig.c -ldl |
| 505 |
|
| 506 |
.PHONY: default |
| 507 |
|
| 508 |
|
| 509 |
|
| 510 |
--- j2sdk/j2se/make/jpda/back/Makefile.orig 2003-01-11 19:36:01.000000000 |
| 511 |
+0300 |
| 512 |
+++ j2sdk/j2se/make/jpda/back/Makefile 2003-01-11 19:36:16.000000000 +0300 |
| 513 |
@@ -35,6 +35,7 @@ |
| 514 |
|
| 515 |
ifeq ($(PLATFORM), linux) |
| 516 |
OTHER_LDLIBS = -ldl |
| 517 |
+ OTHER_LDLIBS += $(JVMLIB) |
| 518 |
endif # PLATFORM |
| 519 |
|
| 520 |
ifeq ($(PLATFORM), solaris) |
| 521 |
|
| 522 |
|
| 523 |
|
| 524 |
|
| 525 |
|
| 526 |
|
| 527 |
I'm not a programmer, but I think that |
| 528 |
--- sun-j2sdk/control/make/common/Defs-linux.gmk 2002-09-06 |
| 529 |
00:00:00.000000000 +0400 |
| 530 |
+++ sun-j2sdk/control/make/common/Defs-linux.gmk.orig 2003-01-10 |
| 531 |
17:18:07.000000000 +0300 |
| 532 |
@@ -44,52 +44,54 @@ |
| 533 |
# define these to avoid picking up ones from aliases or from |
| 534 |
# non-standard locations |
| 535 |
# |
| 536 |
+# It is more appropriate to honor the user's path; removing fixed paths. |
| 537 |
+# --Tushar <tush@×××××.com> |
| 538 |
|
| 539 |
-AR = $(USRBIN_PATH)ar |
| 540 |
-BASENAME = $(UNIXCOMMAND_PATH)basename |
| 541 |
-CAT = $(UNIXCOMMAND_PATH)cat |
| 542 |
+AR = ar |
| 543 |
+BASENAME = basename |
| 544 |
+CAT = cat |
| 545 |
CD = cd # intrinsic unix command |
| 546 |
-CHMOD = $(UNIXCOMMAND_PATH)chmod |
| 547 |
-CMP = $(USRBIN_PATH)cmp |
| 548 |
-COMM = $(USRBIN_PATH)comm |
| 549 |
-COMPRESS = $(USRBIN_PATH)compress |
| 550 |
-CP = $(UNIXCOMMAND_PATH)cp |
| 551 |
-CPIO = $(UNIXCOMMAND_PATH)cpio |
| 552 |
-CUT = $(USRBIN_PATH)cut |
| 553 |
-DATE = $(UNIXCOMMAND_PATH)date |
| 554 |
-DF = $(UNIXCOMMAND_PATH)df |
| 555 |
-DIFF = $(USRBIN_PATH)diff |
| 556 |
-DIRNAME = $(USRBIN_PATH)dirname |
| 557 |
+CHMOD = chmod |
| 558 |
+CMP = cmp |
| 559 |
+COMM = comm |
| 560 |
+COMPRESS = compress |
| 561 |
+CP = cp |
| 562 |
+CPIO = cpio |
| 563 |
+CUT = cut |
| 564 |
+DATE = date |
| 565 |
+DF = df |
| 566 |
+DIFF = diff |
| 567 |
+DIRNAME = dirname |
| 568 |
ECHO = echo -e # intrinsic unix command, with backslash-escaped |
| 569 |
character interpretation |
| 570 |
-EGREP = $(UNIXCOMMAND_PATH)egrep |
| 571 |
-EXPR = $(USRBIN_PATH)expr |
| 572 |
-FIND = $(USRBIN_PATH)find |
| 573 |
-GREP = $(UNIXCOMMAND_PATH)grep |
| 574 |
-LEX = $(USRBIN_PATH)lex |
| 575 |
-LN = $(UNIXCOMMAND_PATH)ln |
| 576 |
-LS = $(UNIXCOMMAND_PATH)ls |
| 577 |
-M4 = $(USRBIN_PATH)m4 |
| 578 |
-MKDIR = $(UNIXCOMMAND_PATH)mkdir |
| 579 |
-MV = $(UNIXCOMMAND_PATH)mv |
| 580 |
-NAWK = $(USRBIN_PATH)gawk |
| 581 |
-PWD = $(UNIXCOMMAND_PATH)pwd |
| 582 |
+EGREP = egrep |
| 583 |
+EXPR = expr |
| 584 |
+FIND = find |
| 585 |
+GREP = grep |
| 586 |
+LEX = lex |
| 587 |
+LN = ln |
| 588 |
+LS = ls |
| 589 |
+M4 = m4 |
| 590 |
+MKDIR = mkdir |
| 591 |
+MV = mv |
| 592 |
+NAWK = gawk |
| 593 |
+PWD = pwd |
| 594 |
#RM is defined by GNU Make as 'rm -f' |
| 595 |
-RMDIR = $(UNIXCOMMAND_PATH)rmdir |
| 596 |
-RPM = $(UNIXCOMMAND_PATH)rpm |
| 597 |
-SED = $(UNIXCOMMAND_PATH)sed |
| 598 |
-SH = $(UNIXCOMMAND_PATH)sh |
| 599 |
-SORT = $(UNIXCOMMAND_PATH)sort |
| 600 |
-STRIP = $(USRBIN_PATH)strip |
| 601 |
-TAR = $(UNIXCOMMAND_PATH)tar |
| 602 |
-TOUCH = $(UNIXCOMMAND_PATH)touch |
| 603 |
-TR = $(USRBIN_PATH)tr |
| 604 |
-TRUE = $(UNIXCOMMAND_PATH)true |
| 605 |
-UNAME = $(UNIXCOMMAND_PATH)uname |
| 606 |
-UNIQ = $(USRBIN_PATH)uniq |
| 607 |
-UNZIP = $(USRBIN_PATH)unzip |
| 608 |
-WC = $(USRBIN_PATH)wc |
| 609 |
-YACC = $(USRBIN_PATH)yacc |
| 610 |
-ZIPEXE = $(USRBIN_PATH)zip |
| 611 |
+RMDIR = rmdir |
| 612 |
+RPM = rpm |
| 613 |
+SED = sed |
| 614 |
+SH = sh |
| 615 |
+SORT = sort |
| 616 |
+STRIP = strip |
| 617 |
+TAR = tar |
| 618 |
+TOUCH = touch |
| 619 |
+TR = tr |
| 620 |
+TRUE = true |
| 621 |
+UNAME = uname |
| 622 |
+UNIQ = uniq |
| 623 |
+UNZIP = unzip |
| 624 |
+WC = wc |
| 625 |
+YACC = yacc |
| 626 |
+ZIPEXE = zip |
| 627 |
|
| 628 |
|
| 629 |
archExpr = case "`$(UNAME) -m`" in \ |
| 630 |
--- sun-j2sdk/j2se/make/common/Defs-linux.gmk.orig 2003-01-10 |
| 631 |
17:26:53.000000000 +0300 |
| 632 |
+++ sun-j2sdk/j2se/make/common/Defs-linux.gmk 2003-01-10 |
| 633 |
17:30:10.000000000 +0300 |
| 634 |
@@ -26,55 +26,55 @@ |
| 635 |
# non-standard locations |
| 636 |
# |
| 637 |
|
| 638 |
-AR = $(USRBIN_PATH)ar |
| 639 |
-BASENAME = $(UNIXCOMMAND_PATH)basename |
| 640 |
-CAT = $(UNIXCOMMAND_PATH)cat |
| 641 |
-CC = $(COMPILER_PATH)gcc |
| 642 |
-CPP = $(COMPILER_PATH)gcc -E |
| 643 |
-CXX = $(COMPILER_PATH)g++ |
| 644 |
+AR = ar |
| 645 |
+BASENAME = basename |
| 646 |
+CAT = cat |
| 647 |
+CC = gcc |
| 648 |
+CPP = gcc -E |
| 649 |
+CXX = g++ |
| 650 |
CD = cd # intrinsic unix command |
| 651 |
-CHMOD = $(UNIXCOMMAND_PATH)chmod |
| 652 |
-CMP = $(USRBIN_PATH)cmp |
| 653 |
-COMPRESS = $(USRBIN_PATH)compress |
| 654 |
-CP = $(UNIXCOMMAND_PATH)cp |
| 655 |
-CPIO = $(UNIXCOMMAND_PATH)cpio |
| 656 |
-CUT = $(USRBIN_PATH)cut |
| 657 |
-DATE = $(UNIXCOMMAND_PATH)date |
| 658 |
-DF = $(UNIXCOMMAND_PATH)df |
| 659 |
-DIFF = $(USRBIN_PATH)diff |
| 660 |
-DIRNAME = $(USRBIN_PATH)dirname |
| 661 |
+CHMOD = chmod |
| 662 |
+CMP = cmp |
| 663 |
+COMPRESS = compress |
| 664 |
+CP = cp |
| 665 |
+CPIO = cpio |
| 666 |
+CUT = )cut |
| 667 |
+DATE = date |
| 668 |
+DF = df |
| 669 |
+DIFF = diff |
| 670 |
+DIRNAME = dirname |
| 671 |
ECHO = echo -e # intrinsic unix command, with backslash-escaped |
| 672 |
character interpretation |
| 673 |
-EGREP = $(UNIXCOMMAND_PATH)egrep |
| 674 |
-EXPR = $(USRBIN_PATH)expr |
| 675 |
-FIND = $(USRBIN_PATH)find |
| 676 |
-HEAD = $(USRBIN_PATH)head |
| 677 |
-GDB = $(USRBIN_PATH)gdb |
| 678 |
-GREP = $(UNIXCOMMAND_PATH)grep |
| 679 |
-LEX = $(USRBIN_PATH)lex |
| 680 |
-LN = $(UNIXCOMMAND_PATH)ln |
| 681 |
-LS = $(UNIXCOMMAND_PATH)ls |
| 682 |
-M4 = $(USRBIN_PATH)m4 |
| 683 |
-MKDIR = $(UNIXCOMMAND_PATH)mkdir |
| 684 |
-MV = $(UNIXCOMMAND_PATH)mv |
| 685 |
-NAWK = $(USRBIN_PATH)gawk |
| 686 |
-PWD = $(UNIXCOMMAND_PATH)pwd |
| 687 |
+EGREP = egrep |
| 688 |
+EXPR = expr |
| 689 |
+FIND = find |
| 690 |
+HEAD = head |
| 691 |
+GDB = gdb |
| 692 |
+GREP = grep |
| 693 |
+LEX = lex |
| 694 |
+LN = ln |
| 695 |
+LS = ls |
| 696 |
+M4 = m4 |
| 697 |
+MKDIR = mkdir |
| 698 |
+MV = mv |
| 699 |
+NAWK = gawk |
| 700 |
+PWD = pwd |
| 701 |
#RM is defined by GNU Make as 'rm -f' |
| 702 |
-RMDIR = $(UNIXCOMMAND_PATH)rmdir |
| 703 |
-RPM = $(UNIXCOMMAND_PATH)rpm |
| 704 |
-SED = $(UNIXCOMMAND_PATH)sed |
| 705 |
-SH = $(UNIXCOMMAND_PATH)sh |
| 706 |
-SORT = $(UNIXCOMMAND_PATH)sort |
| 707 |
-STRIP = $(USRBIN_PATH)strip |
| 708 |
-TAR = $(UNIXCOMMAND_PATH)tar |
| 709 |
-TOUCH = $(UNIXCOMMAND_PATH)touch |
| 710 |
-TR = $(USRBIN_PATH)tr |
| 711 |
-TRUE = $(UNIXCOMMAND_PATH)true |
| 712 |
-UNAME = $(UNIXCOMMAND_PATH)uname |
| 713 |
-UNIQ = $(USRBIN_PATH)uniq |
| 714 |
-UNZIP = $(USRBIN_PATH)unzip |
| 715 |
-UNZIPSFX = $(USRBIN_PATH)unzipsfx |
| 716 |
-YACC = $(USRBIN_PATH)yacc |
| 717 |
-ZIPEXE = $(USRBIN_PATH)zip |
| 718 |
+RMDIR = rmdir |
| 719 |
+RPM = rpm |
| 720 |
+SED = sed |
| 721 |
+SH = sh |
| 722 |
+SORT = sort |
| 723 |
+STRIP = strip |
| 724 |
+TAR = tar |
| 725 |
+TOUCH = touch |
| 726 |
+TR = tr |
| 727 |
+TRUE = true |
| 728 |
+UNAME = uname |
| 729 |
+UNIQ = uniq |
| 730 |
+UNZIP = unzip |
| 731 |
+UNZIPSFX = unzipsfx |
| 732 |
+YACC = yacc |
| 733 |
+ZIPEXE = zip |
| 734 |
|
| 735 |
|
| 736 |
archExpr = case "`$(UNAME) -m`" in \ |
| 737 |
--- sun-j2sdk/hotspot/build/linux/makefiles/vm.make.orig 2003-01-11 |
| 738 |
13:26:54.000000000 +0300 |
| 739 |
+++ sun-j2sdk/hotspot/build/linux/makefiles/vm.make 2003-01-11 |
| 740 |
13:28:27.000000000 +0300 |
| 741 |
@@ -73,9 +73,9 @@ |
| 742 |
# do not include shared lib path in a.outs |
| 743 |
#AOUT_FLAGS += -norunpath |
| 744 |
|
| 745 |
-COMPILE = ${CPP} ${CPPFLAGS} ${CFLAGS} |
| 746 |
-LINK_LIB = ${CPP} -shared -mimpure-text |
| 747 |
-LINK = ${CPP} ${AOUT_FLAGS} |
| 748 |
+COMPILE = ${CXX} ${CPPFLAGS} ${CFLAGS} |
| 749 |
+LINK_LIB = ${CXX} -shared -mimpure-text |
| 750 |
+LINK = ${CXX} ${AOUT_FLAGS} |
| 751 |
|
| 752 |
|
| 753 |
COMPILE.s = ${COMPILE} -S |
| 754 |
@@ -209,6 +209,6 @@ |
| 755 |
|
| 756 |
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c |
| 757 |
echo Making signal interposition lib...; \ |
| 758 |
- $(CC) $(SYMFLAG) -D_GNU_SOURCE -D_REENTRANT -shared -fPIC -o $@ |
| 759 |
$(JSIGSRCDIR)/jsig.c -ldl |
| 760 |
+ $(CC) $(SYMFLAG) -D_GNU_SOURCE -D_REENTRANT -shared -fPIC -o $@ |
| 761 |
$(JSIGSRCDIR)/jsig.c -ldl |
| 762 |
|
| 763 |
.PHONY: default |
| 764 |
|
| 765 |
|
| 766 |
|
| 767 |
--- j2sdk/j2se/make/jpda/back/Makefile.orig 2003-01-11 19:36:01.000000000 |
| 768 |
+0300 |
| 769 |
+++ j2sdk/j2se/make/jpda/back/Makefile 2003-01-11 19:36:16.000000000 +0300 |
| 770 |
@@ -35,6 +35,7 @@ |
| 771 |
|
| 772 |
ifeq ($(PLATFORM), linux) |
| 773 |
OTHER_LDLIBS = -ldl |
| 774 |
+ OTHER_LDLIBS += $(JVMLIB) |
| 775 |
endif # PLATFORM |
| 776 |
|
| 777 |
ifeq ($(PLATFORM), solaris) |
| 778 |
|
| 779 |
|
| 780 |
|
| 781 |
|
| 782 |
|
| 783 |
I'm not a programmer but I think that |
| 784 |
|
| 785 |
-COMPILE = ${CPP} ${CPPFLAGS} ${CFLAGS} |
| 786 |
-LINK_LIB = ${CPP} -shared -mimpure-text |
| 787 |
-LINK = ${CPP} ${AOUT_FLAGS} |
| 788 |
+COMPILE = ${CXX} ${CPPFLAGS} ${CFLAGS} |
| 789 |
+LINK_LIB = ${CXX} -shared -mimpure-text |
| 790 |
+LINK = ${CXX} ${AOUT_FLAGS} |
| 791 |
|
| 792 |
is better than |
| 793 |
|
| 794 |
export LIBS="-lstdc++" |
| 795 |
|
| 796 |
because I could'n compile sun-j2sdk-1.4.1 with "export LIBS="-lstdc++"" |
Archives