Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mysql-workbench-5.2.27-2 : fix F-14 build (patches)
- Loading branch information
1 parent
85aa564
commit 0c0a5a2
Showing
2 changed files
with
55 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
diff -up mysql-workbench-gpl-5.2.27/ext/Makefile.am.ctemplate mysql-workbench-gpl-5.2.27/ext/Makefile.am | ||
--- mysql-workbench-gpl-5.2.27/ext/Makefile.am.ctemplate 2010-09-18 16:17:13.681151167 +0200 | ||
+++ mysql-workbench-gpl-5.2.27/ext/Makefile.am 2010-09-18 16:17:13.688131149 +0200 | ||
@@ -1,7 +1,4 @@ | ||
|
||
-if BUILD_CTEMPLATE | ||
-else | ||
-ctemplate_dirs=ctemplate | ||
-endif | ||
|
||
-SUBDIRS=scintilla/gtk $(ctemplate_dirs) | ||
+SUBDIRS=scintilla/gtk | ||
+ | ||
diff -up mysql-workbench-gpl-5.2.27/ext/Makefile.in.ctemplate mysql-workbench-gpl-5.2.27/ext/Makefile.in | ||
--- mysql-workbench-gpl-5.2.27/ext/Makefile.in.ctemplate 2010-09-18 16:17:13.000000000 +0200 | ||
+++ mysql-workbench-gpl-5.2.27/ext/Makefile.in 2010-09-18 16:19:17.531005859 +0200 | ||
@@ -53,7 +53,8 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re | ||
distclean-recursive maintainer-clean-recursive | ||
ETAGS = etags | ||
CTAGS = ctags | ||
-DIST_SUBDIRS = scintilla/gtk ctemplate | ||
+@BUILD_CTEMPLATE_FALSE@ctemplate_dirs = ctemplate | ||
+DIST_SUBDIRS = scintilla/gtk $(ctemplate_dirs) | ||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
ACLOCAL = @ACLOCAL@ | ||
AMTAR = @AMTAR@ | ||
@@ -213,7 +214,6 @@ sysconfdir = @sysconfdir@ | ||
target_alias = @target_alias@ | ||
top_builddir = @top_builddir@ | ||
top_srcdir = @top_srcdir@ | ||
-@BUILD_CTEMPLATE_FALSE@ctemplate_dirs = ctemplate | ||
SUBDIRS = scintilla/gtk $(ctemplate_dirs) | ||
all: all-recursive | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
diff -up mysql-workbench-gpl-5.2.27/modules/db/Makefile.am.dnl mysql-workbench-gpl-5.2.27/modules/db/Makefile.am | ||
--- mysql-workbench-gpl-5.2.27/modules/db/Makefile.am.dnl 2010-09-18 17:06:10.582256133 +0200 | ||
+++ mysql-workbench-gpl-5.2.27/modules/db/Makefile.am 2010-09-18 17:07:37.070380972 +0200 | ||
@@ -11,4 +11,4 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t | ||
|
||
dbutils_grt_la_SOURCES=src/dbutils.cpp | ||
dbutils_grt_la_LDFLAGS=-module | ||
-dnl dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la | ||
+#dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la | ||
diff -up mysql-workbench-gpl-5.2.27/modules/db/Makefile.in.dnl mysql-workbench-gpl-5.2.27/modules/db/Makefile.in | ||
--- mysql-workbench-gpl-5.2.27/modules/db/Makefile.in.dnl 2010-09-18 17:06:15.708005899 +0200 | ||
+++ mysql-workbench-gpl-5.2.27/modules/db/Makefile.in 2010-09-18 17:07:07.737130492 +0200 | ||
@@ -523,7 +523,7 @@ uninstall-am: uninstall-pkglibLTLIBRARIE | ||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | ||
tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES | ||
|
||
-dnl dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la | ||
+#dbutils_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la $(top_srcdir)/backend/grt/libgrtbe.la | ||
# Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
# Otherwise a system limit (for SysV at least) may be exceeded. | ||
.NOEXPORT: |