diff options
| author | Johann Visagie <wjv@FreeBSD.org> | 2001-11-14 13:55:28 +0000 |
|---|---|---|
| committer | Johann Visagie <wjv@FreeBSD.org> | 2001-11-14 13:55:28 +0000 |
| commit | 6e76729a1c9d853feedc5706de8ddd759a80a1eb (patch) | |
| tree | 9a302cf04ea2ad428a2179be6362d84e5ba1df8a /databases/libodbc++/files | |
| parent | 516e4a3b79239eae1d953580a8e42986793d9a84 (diff) | |
| download | ports-6e76729a1c9d853feedc5706de8ddd759a80a1eb.tar.gz ports-6e76729a1c9d853feedc5706de8ddd759a80a1eb.zip | |
Notes
Diffstat (limited to 'databases/libodbc++/files')
| -rw-r--r-- | databases/libodbc++/files/patch-Makefile.in | 19 | ||||
| -rw-r--r-- | databases/libodbc++/files/patch-configure | 26 |
2 files changed, 31 insertions, 14 deletions
diff --git a/databases/libodbc++/files/patch-Makefile.in b/databases/libodbc++/files/patch-Makefile.in index e80965aa67cf..68b416c27a5c 100644 --- a/databases/libodbc++/files/patch-Makefile.in +++ b/databases/libodbc++/files/patch-Makefile.in @@ -6,14 +6,13 @@ ---- Makefile.in.orig Wed Dec 13 03:14:07 2000 -+++ Makefile.in Tue Oct 2 17:19:45 2001 -@@ -114,7 +114,7 @@ +--- Makefile.in.orig Wed Nov 7 17:09:47 2001 ++++ Makefile.in Wed Nov 14 13:09:03 2001 +@@ -123,7 +123,6 @@ + src \ + @SUBDIR_TESTS@ \ + @SUBDIR_QTSQLXX@ \ +-doc \ + @SUBDIR_ISQLXX@ \ + win32 - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = include src @SUBDIR_QT@ @SUBDIR_TESTS@ @SUBDIR_QTSQLXX@ doc @SUBDIR_ISQLXX@ win32 -+SUBDIRS = include src @SUBDIR_QT@ @SUBDIR_TESTS@ @SUBDIR_QTSQLXX@ @SUBDIR_ISQLXX@ win32 - - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/databases/libodbc++/files/patch-configure b/databases/libodbc++/files/patch-configure index aacb29a8f4f7..bb3c0ebe84eb 100644 --- a/databases/libodbc++/files/patch-configure +++ b/databases/libodbc++/files/patch-configure @@ -1,14 +1,32 @@ ---- configure.orig Wed Dec 13 02:36:14 2000 -+++ configure Wed Oct 3 17:34:03 2001 -@@ -3752,9 +3752,9 @@ +The fudging of the value of $ltmain is a workaround for a bug in bsd.port.mk, +described (with patch) in PR 31142. + +-- Johann Visagie <wjv@FreeBSD.org> + + + +--- configure.orig Wed Nov 7 17:02:23 2001 ++++ configure Wed Nov 14 13:38:01 2001 +@@ -2823,7 +2823,8 @@ + # All known linkers require a `.a' archive for static linking (except M$VC, + # which needs '.lib'). + libext=a +-ltmain="$ac_aux_dir/ltmain.sh" ++ac_aux_dir_tmp="$ac_aux_dir" ++ltmain="$ac_aux_dir_tmp/ltmain.sh" + ofile="$default_ofile" + with_gnu_ld="$lt_cv_prog_gnu_ld" + need_locks="$enable_libtool_lock" +@@ -7136,10 +7137,10 @@ if test "x$enable_threads" = "xyes" then - QT_LIBS="-lqt-mt" + QT_LIBS="-lqt2-mt" + QT_DEFS="-DODBCXX_QT -DQT_THREAD_SUPPORT" else - QT_LIBS="-lqt" + QT_LIBS="-lqt2" + QT_DEFS="-DODBCXX_QT" fi - QT_MOC="$qt_moc" |