SHARE
TWEET

neko-1.8.1-gentoo.patch

a guest Mar 11th, 2010 106 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -ur neko-1.8.1-orig/Makefile neko-1.8.1/Makefile
  2. --- neko-1.8.1-orig/Makefile    2010-03-11 21:50:22.000000000 +0200
  3. +++ neko-1.8.1/Makefile 2010-03-11 21:56:09.000000000 +0200
  4.  -7,6 +7,7 @@
  5.  MAKESO = $(CC) -shared -WBsymbolic
  6.  LIBNEKO_NAME = libneko.so
  7.  LIBNEKO_LIBS = -ldl -lgc -lm
  8. +LIBNEKO_FLAGS = -Wl,-soname,libneko.so
  9.  NEKOVM_FLAGS = -Lbin -lneko
  10.  STD_NDLL_FLAGS = ${NEKOVM_FLAGS}
  11.  INSTALL_FLAGS =
  12.  -117,7 +118,7 @@
  13.         (cd src; ${NEKO_EXEC} nekoc -link ../boot/nekoml.n nekoml/Main)
  14.  
  15.  bin/${LIBNEKO_NAME}: ${LIBNEKO_OBJECTS}
  16. -       ${MAKESO} ${EXTFLAGS} -o $@ ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS}
  17. +       ${MAKESO} ${LIBNEKO_FLAGS} ${EXTFLAGS} -o $@ ${LIBNEKO_OBJECTS} ${LIBNEKO_LIBS}
  18.  
  19.  bin/neko: $(VM_OBJECTS)
  20.         ${CC} ${CFLAGS} ${EXTFLAGS} -o $@ ${VM_OBJECTS} ${NEKOVM_FLAGS}
  21. diff -ur neko-1.8.1-orig/src/tools/install.neko neko-1.8.1/src/tools/install.neko
  22. --- neko-1.8.1-orig/src/tools/install.neko      2010-03-11 21:50:22.000000000 +0200
  23. +++ neko-1.8.1/src/tools/install.neko   2010-03-11 21:59:46.000000000 +0200
  24.  -39,11 +39,6 @@
  25.  // LIBS DATAS
  26.  
  27.  libs = {
  28. -       mod_neko => {
  29. -               src => $array("../../vm/stats","mod_neko","cgi"),
  30. -               inc => "httpd.h",
  31. -               incname => "Apache 1.3.x"
  32. -       },
  33.         mod_neko2 => {
  34.                 src => $array("../../vm/stats","mod_neko","cgi"),
  35.                 inc => $array("httpd.h","apr.h"),
  36.  -213,33 +208,6 @@
  37.         return arr2;
  38.  }
  39.  
  40. -readline = function() {
  41. -       $print("> ");
  42. -       var b = buffer_new();
  43. -       do {
  44. -               var c = read_char(stdin);
  45. -               if( c == 10 )
  46. -                       break;
  47. -               buffer_add_char(b,c);
  48. -       } while(true);
  49. -       return buffer_string(b);
  50. -}
  51. -
  52. -request_include = function(incl) {
  53. -       var s = readline();
  54. -       if( s == "s" )
  55. -               return null;
  56. -       return append(incl,s);
  57. -}
  58. -
  59. -request_lib = function() {
  60. -       var s = readline();
  61. -       if( s == "s" )
  62. -               return false;
  63. -       libraries = append(libraries,s);
  64. -       return true;
  65. -}
  66. -
  67.  find_file = function(f,arr) {
  68.         var i = 0;
  69.         while( i < $asize(arr) ) {
  70.  -310,13 +278,9 @@
  71.  
  72.  loop_include = function(data,i,incl) {
  73.         var dir;
  74. -       while( (dir = find_file(data.inc[i],incl)) == null ) {
  75. -               $print("The file "+data.inc[i]+" provided when installing "+data.incname+" was not found\n");
  76. -               $print("Please enter a valid include path to look for it\n");
  77. -               $print("Or 's' to skip this library\n");
  78. -               incl = request_include(incl);
  79. -               if( incl == null )
  80. -                       return null;
  81. +       if( (dir = find_file(data.inc[i],incl)) == null ) {
  82. +               $print("The file "+data.inc[i]+" provided when installing "+data.incname+" was not found (ignored)\n");
  83. +               return null;
  84.         }
  85.         return dir;
  86.  }
  87.  -341,12 +305,9 @@
  88.         if( linklib == null )
  89.                 linklib = "";
  90.         else {
  91. -               while( (dir = find_file(linklib,libraries)) == null ) {
  92. +               if( (dir = find_file(linklib,libraries)) == null ) {
  93.                         $print("The file "+linklib+" provided when installing "+data.incname+" was not found\n");
  94. -                       $print("Please enter a valid include path to look for it\n");
  95. -                       $print("Or 's' to skip this library\n");
  96. -                       if( $not(request_lib()) )
  97. -                               return;
  98. +                       return;
  99.                 }
  100.                 linklib = dir + "/" + linklib;
  101.         }
RAW Paste Data
Top