the patch needed for my neko-1.6.0-r2.ebuild to work

neko-1.6.0-gentoo.patch (text/plain), 2.34 KB, created by daniel fischer on 2007-12-12 20:31:30 UTC

diff -ur neko-1.6.0-orig/Makefile neko-1.6.0/Makefile
--- neko-1.6.0-orig/Makefile	2007-07-25 16:59:41.000000000 +0200
+++ neko-1.6.0/Makefile	2007-12-12 20:34:06.426798654 +0100
@@ -6,7 +6,8 @@
 EXTFLAGS = -pthread
 MAKESO = $(CC) -shared -WBsymbolic
 LIBNEKO_NAME = libneko.so
-LIBNEKO_LIBS = -ldl -lgc -lm
+LIBNEKO_LIBS = -ldl -lgc -lm
+LIBNEKO_FLAGS = -Wl,-soname,libneko.so
 NEKOVM_FLAGS = -Lbin -lneko
 STD_NDLL_FLAGS = ${NEKOVM_FLAGS}
 INSTALL_FLAGS =
@@ -117,7 +118,7 @@
 	(cd src; ${NEKO_EXEC} nekoc -link ../boot/nekoml.n nekoml/Main)
 
 bin/${LIBNEKO_NAME}: ${LIBNEKO_OBJECTS}
-	${MAKESO} ${EXTFLAGS} -o $@ ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS}
+	${MAKESO} ${LIBNEKO_FLAGS} ${EXTFLAGS} -o $@ ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS}
 
 bin/neko: $(VM_OBJECTS)
 	${CC} ${CFLAGS} ${EXTFLAGS} -o $@ ${VM_OBJECTS} ${NEKOVM_FLAGS}
diff -ur neko-1.6.0-orig/src/tools/install.neko neko-1.6.0/src/tools/install.neko
--- neko-1.6.0-orig/src/tools/install.neko	2007-07-25 16:59:40.000000000 +0200
+++ neko-1.6.0/src/tools/install.neko	2007-12-12 19:23:30.185389013 +0100
@@ -54,8 +54,7 @@
 		src => $array("mysql"),
 		inc => "mysql.h",
 		incname => "MySQL 4.+"
-		lib => "libmysqlclient.a",
-		lparams => "-lz"
+		lparams => "-lmysqlclient"
 	},
 	regexp => {
 		src => $array("regexp"),
@@ -260,12 +259,8 @@
 loop_include = function(data,i,incl) {
 	var dir;
 	while( (dir = find_file(data.inc[i],incl)) == null ) {
-		$print("The file "+data.inc[i]+" provided when installing "+data.incname+" was not found\n");
-		$print("Please enter a valid include path to look for it\n");
-		$print("Or 's' to skip this library\n");
-		incl = request_include(incl);
-		if( incl == null )
-			return null;
+		$print("The file "+data.inc[i]+" provided when installing "+data.incname+" was not found (ignored)\n");
+		return null;
 	}
 	return dir;
 }
@@ -295,11 +290,8 @@
 		linklib = "";
 	else {
 		while( (dir = find_file(linklib,libraries)) == null ) {
-			$print("The file "+linklib+" provided when installing "+data.incname+" was not found\n");
-			$print("Please enter a valid include path to look for it\n");
-			$print("Or 's' to skip this library\n");
-			if( $not(request_lib()) )
-				return;
+			$print("The file "+linklib+" provided when installing "+data.incname+" was not found (ignored)\n");
+			return;
 		}
 		linklib = dir + "/" + linklib;
 	}