瀏覽代碼

port to NetBSD 1.6.2

Ralf S. Engelschall 21 年之前
父節點
當前提交
ab25964b8c
共有 6 個文件被更改,包括 77 次插入34 次删除
  1. 1 0
      openpkg/HISTORY
  2. 1 1
      openpkg/openpkg.spec
  3. 1 1
      openpkg/rpm.patch.bugfix
  4. 1 1
      openpkg/rpm.patch.feature
  5. 32 3
      openpkg/rpm.patch.porting
  6. 41 28
      openpkg/rpm.patch.regen

+ 1 - 0
openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 ====
 
+20040429 port to NetBSD 1.6.2
 20040428 fix "openpkg man" command now that OPENPKG_TOOLS_CMDPATH is not provided
 20040428 let rc point out that it searches subdirectories for unresolved file conflicts
 20040427 fixed rpmpopt: replace hard-coded bash path and do not use reserved shell keywords

+ 1 - 1
openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040428
+%define       V_openpkg  20040429
 
 #   the used software versions
 %define       V_rpm      4.2.1

+ 1 - 1
openpkg/rpm.patch.bugfix

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 18-Apr-2004
+##  Created on: 29-Apr-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.

+ 1 - 1
openpkg/rpm.patch.feature

@@ -10,7 +10,7 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 18-Apr-2004
+##  Created on: 29-Apr-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.

+ 32 - 3
openpkg/rpm.patch.porting

@@ -10,12 +10,28 @@
 ##  'patch' tool to upgrade those files. Each patch snippet is annotated
 ##  with a short description.
 ##
-##  Created on: 18-Apr-2004
+##  Created on: 29-Apr-2004
 ##
 ##  ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
 ##             RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
 ##
 
++---------------------------------------------------------------------------
+| Evil hack to get GNU libtool working under NetBSD 1.6
+| with the ugly way RPM currently has to use it.
++---------------------------------------------------------------------------
+Index: ltconfig
+--- ltconfig	17 Jan 2001 16:22:58 -0000	1.1.1.7
++++ ltconfig	29 Apr 2004 13:07:28 -0000	1.4
+@@ -2017,6 +2017,7 @@
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+   shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method=pass_all
+   ;;
+ 
+ openbsd*)
+
 +---------------------------------------------------------------------------
 | Disable any POSIX Pthread stuff because in OpenPKG we use
 | non-Pthread mutexes in Berkeley-DB.
@@ -1037,7 +1053,7 @@ Index: lib/fsm.c
 +---------------------------------------------------------------------------
 Index: aclocal.m4
 --- aclocal.m4	16 Jul 2003 17:05:28 -0000	1.1.1.10
-+++ aclocal.m4	22 Jan 2004 21:42:04 -0000	1.2
++++ aclocal.m4	29 Apr 2004 13:08:17 -0000	1.3
 @@ -2838,7 +2838,7 @@
      runpath_var=LD_RUN_PATH
      ;;
@@ -1055,7 +1071,20 @@ Index: aclocal.m4
      ;;
    esac
    ;;
-@@ -4414,7 +4415,7 @@
+@@ -4375,11 +4376,7 @@
+   ;;
+ 
+ netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
+-  fi
++  lt_cv_deplibs_check_method='pass_all'
+   ;;
+ 
+ newos6*)
+@@ -4414,7 +4411,7 @@
    lt_cv_file_magic_test_file=/lib/libc.so
    ;;
  

文件差異過大導致無法顯示
+ 41 - 28
openpkg/rpm.patch.regen