diff options
| author | recht <recht@pkgsrc.org> | 2004-03-13 12:09:36 +0000 |
|---|---|---|
| committer | recht <recht@pkgsrc.org> | 2004-03-13 12:09:36 +0000 |
| commit | b1004161e8c4ab3ad642e8f44fedbe890304574c (patch) | |
| tree | 9abe883f7fe355dfa8af3099ea63a9aa4fa7fc58 /databases | |
| parent | 8f8df9c339f73662dc6ed815d31c373d10d5e5bd (diff) | |
| download | pkgsrc-b1004161e8c4ab3ad642e8f44fedbe890304574c.tar.gz | |
Fix the build by adding USE_LANGUAGES=c c++ and linking myisam/isam
with CXX.
Noted by kristerw's bulk-build and Michal Pasternak on tech-pkg@.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql4-client/Makefile.common | 3 | ||||
| -rw-r--r-- | databases/mysql4-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/mysql4-server/patches/patch-aw | 13 | ||||
| -rw-r--r-- | databases/mysql4-server/patches/patch-ax | 13 |
4 files changed, 31 insertions, 2 deletions
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index 0c401e91fe7..f94fb1808e1 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2004/03/10 14:54:05 tv Exp $ +# $NetBSD: Makefile.common,v 1.5 2004/03/13 12:09:36 recht Exp $ DISTNAME= mysql-4.0.18 CATEGORIES= databases @@ -62,6 +62,7 @@ CFLAGS+= -DHAVE_CURSES_H CXXFLAGS+= -DHAVE_CURSES_H .endif +USE_LANGUAGES= c c++ USE_GNU_TOOLS+= make USE_PERL5= # defined USE_LIBTOOL= # defined diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo index 1b4b41f827c..f3627c53205 100644 --- a/databases/mysql4-server/distinfo +++ b/databases/mysql4-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2004/03/07 19:42:55 martti Exp $ +$NetBSD: distinfo,v 1.4 2004/03/13 12:09:37 recht Exp $ SHA1 (mysql-4.0.18.tar.gz) = 101f199faead0d22d2da2b1ac82b8c071aa987a8 Size (mysql-4.0.18.tar.gz) = 13422686 bytes @@ -13,3 +13,5 @@ SHA1 (patch-as) = c1f61c4f02d89fc5e89617a063f7ea1b0fa438d6 SHA1 (patch-at) = 3a457c3f6b13312cb71b663108abd0ace09f2be4 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91 SHA1 (patch-av) = 6ea5b9338d223f1380386288c537f55d4fd7a7d7 +SHA1 (patch-aw) = 6beb03517de678def5631517c8a7db7ea6540137 +SHA1 (patch-ax) = 8e21c394b9cd6f7f2a0cae0c76ac08d224a18420 diff --git a/databases/mysql4-server/patches/patch-aw b/databases/mysql4-server/patches/patch-aw new file mode 100644 index 00000000000..db5cafd47f6 --- /dev/null +++ b/databases/mysql4-server/patches/patch-aw @@ -0,0 +1,13 @@ +$NetBSD: patch-aw,v 1.1 2004/03/13 12:09:37 recht Exp $ + +--- isam/Makefile.in.orig 2004-02-10 19:16:49.000000000 +0100 ++++ isam/Makefile.in 2004-03-13 12:26:18.000000000 +0100 +@@ -370,7 +370,7 @@ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) ++CCLD = $(CXX) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + DIST_SOURCES = $(libnisam_a_SOURCES) $(isamchk_SOURCES) isamlog.c \ diff --git a/databases/mysql4-server/patches/patch-ax b/databases/mysql4-server/patches/patch-ax new file mode 100644 index 00000000000..f3afd82bb8c --- /dev/null +++ b/databases/mysql4-server/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1 2004/03/13 12:09:37 recht Exp $ + +--- myisam/Makefile.in.orig 2004-03-13 12:38:20.000000000 +0100 ++++ myisam/Makefile.in 2004-03-13 12:38:46.000000000 +0100 +@@ -407,7 +407,7 @@ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ + $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-CCLD = $(CC) ++CCLD = $(CXX) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + DIST_SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \ |