Fix patch to actually apply:

omit the scripts/Makefile.in hunks, we run autoreconf anyway,
omit the scripts/perl/Makefile.PL hunk which is unrelated and unnecessary.
This commit is contained in:
Kevin Kofler 2008-06-06 18:37:06 +00:00
parent 8550af93ff
commit 1988d7f785
1 changed files with 0 additions and 103 deletions

View File

@ -228,109 +228,6 @@ Index: scripts/python/openbabel.py
+import obcore
+import obconversion
+import obtemplate
Index: scripts/Makefile.in
===================================================================
--- scripts/Makefile.in (revision 2534)
+++ scripts/Makefile.in (revision 2535)
@@ -34,8 +34,12 @@
subdir = scripts
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/autoconf/libtool.m4 \
+ $(top_srcdir)/autoconf/ltoptions.m4 \
+ $(top_srcdir)/autoconf/ltsugar.m4 \
+ $(top_srcdir)/autoconf/ltversion.m4 \
+ $(top_srcdir)/autoconf/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -89,6 +93,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -98,6 +103,8 @@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -173,6 +180,7 @@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = openbabel-perl.i perl \
@@ -185,9 +193,11 @@
# build the scripting language interfaces if --enable-maintainer-mode was set
# and SWIG is available -- please use the most recent version of SWIG
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@BUILT_SOURCES = perl/openbabel_perl.cpp \
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ python/openbabel_python.cpp \
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ java/openbabel_java.cpp \
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ csharp/openbabel_csharp.cpp \
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ python/obcore.cpp \
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ python/obconversion.cpp \
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ python/obtemplate.cpp \
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ $(am__append_1)
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@script_includes = $(top_srcdir)/include/openbabel
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@script_headers = $(script_includes)/mol.h $(script_includes)/obconversion.h \
@@ -386,20 +396,18 @@
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ sed -e "s/^@EXPORT.*/& sub dl_load_flags { 0x01 }/" <perl/OpenBabel.pm >perl/OpenBabel.new;
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ mv perl/OpenBabel.new perl/OpenBabel.pm;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@python/openbabel_python.cpp: openbabel-python.i $(script_headers)
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@python/obconversion.cpp: openbabel-python2.i $(script_headers)
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ $(SWIG) -small -O -python -templatereduce -naturalvar \
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ -c++ -o $@ -I$(top_srcdir)/include -I$(top_builddir)/include $<;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ echo "import sys" >python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ echo "if sys.platform.find(\"linux\") != -1:" >>python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ echo " try:" >>python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ echo " import dl" >>python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ echo " except ImportError:" >>python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ echo " import DLFCN as dl" >>python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ echo " sys.setdlopenflags(sys.getdlopenflags() | dl.RTLD_GLOBAL)" >>python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ echo >>python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ cat python/openbabel.py >>python/ob.py;
-@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ mv python/ob.py python/openbabel.py;
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@python/obtemplate.cpp: openbabel-python3.i $(script_headers)
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ $(SWIG) -small -O -python -templatereduce -naturalvar \
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ -c++ -o $@ -I$(top_srcdir)/include -I$(top_builddir)/include $<;
+
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@python/obcore.cpp: openbabel-python.i $(script_headers)
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ $(SWIG) -small -O -python -templatereduce -naturalvar \
+@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ -c++ -o $@ -I$(top_srcdir)/include -I$(top_builddir)/include $<;
+
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@java/openbabel_java.cpp: openbabel-java.i $(script_headers)
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ $(SWIG) -small -O -java -naturalvar -templatereduce -c++ -o $@ \
@BUILD_SWIG_TRUE@@MAINTAINER_MODE_TRUE@ -I$(top_srcdir)/include -I$(top_builddir)/include $<;
Index: scripts/perl/Makefile.PL
===================================================================
--- scripts/perl/Makefile.PL (revision 2534)
+++ scripts/perl/Makefile.PL (revision 2535)
@@ -9,9 +9,9 @@
# check if we're compiling in the source directory
$ldfrom = "\$(OBJECT) -L$srcdir/.libs -lopenbabel -lz"
+ if (-r "$srcdir/.libs/libopenbabel.dylib") and (-s _) and (-B _);
+$ldfrom = "\$(OBJECT) -L$srcdir/.libs -lopenbabel -lz"
if (-r "$srcdir/.libs/libopenbabel.so") and (-s _) and (-B _);
-$ldfrom = "\$(OBJECT) -L$srcdir/.libs -lopenbabel -lz"
- if (-r "$srcdir/.libs/libopenbabel.dylib") and (-s _) and (-B _);
$ldfrom = "\$(OBJECT) $srcdir/.libs/libopenbabel.a -lz"
if (-r "$srcdir/.libs/libopenbabel.a") and (-s _) and (-B _);
Index: scripts/Makefile.am
===================================================================
--- scripts/Makefile.am (revision 2534)