瀏覽代碼

update mysql: export headers aes.h/rijndael.h and library libmysys to mysql_config

Herbert Schmid 21 年之前
父節點
當前提交
ed74ee65c9
共有 2 個文件被更改,包括 34 次插入1 次删除
  1. 33 0
      mysql/mysql.patch
  2. 1 1
      mysql/mysql.spec

+ 33 - 0
mysql/mysql.patch

@@ -117,3 +117,36 @@
   stdlib.h stddef.h \
   strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
   sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
+Index: include/Makefile.in
+--- include/Makefile.in.orig	2004-10-28 02:48:55 +0200
++++ include/Makefile.in	2004-12-14 14:27:28 +0100
+@@ -281,14 +281,14 @@
+ 		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
+ 			errmsg.h my_global.h my_net.h my_alloc.h \
+ 			my_getopt.h sslopt-longopts.h my_dir.h \
+-			sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)
++			sslopt-vars.h sslopt-case.h my_aes.h rijndael.h $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ 			nisam.h heap.h merge.h my_bitmap.h\
+ 			myisam.h myisampack.h myisammrg.h ft_global.h\
+ 			mysys_err.h my_base.h help_start.h help_end.h \
+-			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
+-			my_aes.h my_tree.h hash.h thr_alarm.h \
++			my_nosys.h my_alarm.h queues.h sha1.h \
++			my_tree.h hash.h thr_alarm.h \
+ 			thr_lock.h t_ctype.h violite.h md5.h mysql_version.h.in
+ 
+ 
+Index: scripts/mysql_config.sh
+--- scripts/mysql_config.sh.orig	2004-10-28 02:48:36 +0200
++++ scripts/mysql_config.sh	2004-12-14 14:29:04 +0100
+@@ -86,7 +86,7 @@
+ 
+ # Create options
+ 
+-libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"
++libs="$ldflags -L$pkglibdir -lmysqlclient -lmysys $client_libs"
+ libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
+ libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
+ libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

+ 1 - 1
mysql/mysql.spec

@@ -40,7 +40,7 @@ Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20041209
+Release:      20041214
 
 #   package options
 %option       with_server    yes