2012-08-30 127 views
0

我試圖修補,以便與這個補丁,我從http://www.digipedia.pl/usenet/thread/15809/3624/試圖編譯HDF5上的MinGW/MSYS

發現編譯它MinGW的HDF5 1.8.9我試着用MSYS補丁

patch <patchfile.patch 

繼人給我

(Stripping trailing CRs from patch.) 
patching file configure.in 
patch: **** malformed patch at line 4: dnl rebuild rules. 

**** Patch for configure.in 
******************************************* 
--- /tmp/hdf5-1.8.9/configure.in.old 2012-05-09 10:07:27.000000000 -0500 
+++ /tmp/hdf5-1.8.9/configure.in 2012-07-18 16:51:35.000000000 -0500 
@@ -49,6 +49,16 @@ 
dnl rebuild rules. 
AM_MAINTAINER_MODE 

+AC_ARG_WITH(mingw, [--with-mingw enable compilation with gnu gcc under 
mingw]) 
+AM_CONDITIONAL([WITH_MINGW], [test "$with_mingw" = "yes"]) 
+if test "$with_mingw" = "yes"; then 
+ AC_DEFINE([HAVE_WINDOWS],[1],[Define if the Windows virtual file driver 
should be compiled]) 
+ AC_DEFINE([HAVE_MINGW],[1],[Define if on mingw]) 
+ AC_DEFINE([HAVE_WIN32_API],[1],[Define if on the Windows platform]) 
+dnl We also need to add a -lwsock32 to avert [email protected] errors 
+ LIBS="$LIBS -lwsock32" 
+fi 
+ 
dnl Run post processing on files created by configure. 
dnl src/H5pubconf.h: 
dnl Generate src/H5pubconf.h from src/H5config.h by prepending H5_ to all 

而另外一個

(Stripping trailing CRs from patch.) 
patching file Makefile.am 
patch: **** malformed patch at line 7: H5Zdeflate.c H5Zfletcher32.c H5Znbit.c H5 
Zshuffle.c H5Zszip.c \ 

**** Patch for src/Makefile.am 
******************************************* 
--- /tmp/hdf5-1.8.9/src/Makefile.am.old 2012-05-09 10:05:58.000000000 
-0500 
+++ /tmp/hdf5-1.8.9/src/Makefile.am 2012-07-18 16:54:27.000000000 -0500 
@@ -103,6 +103,9 @@ 
H5Zdeflate.c H5Zfletcher32.c H5Znbit.c H5Zshuffle.c H5Zszip.c \ 
H5Zscaleoffset.c H5Ztrans.c 

+if WITH_MINGW 
+ libhdf5_la_SOURCES+=H5FDwindows.c 
+endif 

# Public headers 
include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h 
H5version.h \ 
@@ -115,6 +118,10 @@ 
H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h \ 
H5Tpublic.h H5Zpublic.h 

+if WITH_MINGW 
+ libhdf5_la_SOURCES+=H5FDwindows.h 
+endif 
+ 
# install libhdf5.settings in lib directory 
settingsdir=$(libdir) 
settings_DATA=libhdf5.settings 

如果有人能告訴我如何圍繞修補這個正確或另一種方式,我應該心存感激。

回答

1

我不是一個補丁專家,所以我不能告訴你補丁中的錯誤在哪裏,但我可以給你另一種解決方案:由於補丁太小,爲什麼不直接更新所述文件?

只是找到其中的添加應該使用的行號(@@之間)和上下文的幾行(不含線領先+-),並在合適的地點,其他行(那些剛開始用+添加和當然,不要忘記在你這樣做的時候去掉領先的+標誌)。

+0

是的,我已經完成了這個任何事情。 – Madushan