diff options
| author | bouyer <bouyer@pkgsrc.org> | 2014-05-14 20:22:41 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2014-05-14 20:22:41 +0000 |
| commit | e7dfd98a0d8b145693856b929c0e6166d5456d7c (patch) | |
| tree | cf26e8bd5f53df41ade8d9d184bdbb0cd322ee3d /sysutils | |
| parent | e3857adb73bdf4dd87fa394b873627cffb6c60bb (diff) | |
| download | pkgsrc-e7dfd98a0d8b145693856b929c0e6166d5456d7c.tar.gz | |
Make it build on netbsd-6 (and maybe netbsd-5):
Don't include other libraries in an archive, our ar seems to not
support it. Instead, list all libraries at link time.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xentools41/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile | 13 | ||||
| -rw-r--r-- | sysutils/xentools41/patches/patch-xenstat_xentop_Makefile | 15 |
3 files changed, 29 insertions, 4 deletions
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo index 6ad2b37d6a7..e652f6c0110 100644 --- a/sysutils/xentools41/distinfo +++ b/sysutils/xentools41/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2014/02/13 11:12:58 drochner Exp $ +$NetBSD: distinfo,v 1.36 2014/05/14 20:22:41 bouyer Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -59,5 +59,6 @@ SHA1 (patch-ocaml_common.make) = c59d32301198d65691ab23529dd791de5ac40199 SHA1 (patch-ocaml_xenstored_define.ml) = f44841625554ceba6e83dbb41f688993c2a8d9a2 SHA1 (patch-ocaml_xenstored_utils.ml) = cc792a696743fa348b274b1c23783ea1a0d7da47 SHA1 (patch-qemu-phy-devices) = fef90e50ef0a58db2f2b49b6c23218f371791de5 -SHA1 (patch-xenstat_libxenstat_Makefile) = d797b824afd98ec3dd17c5f9ac1307f0eaab8214 +SHA1 (patch-xenstat_libxenstat_Makefile) = 800dfa58e9f65cfc9694ff4ee8a85c96d6336cfe +SHA1 (patch-xenstat_xentop_Makefile) = 6b59d1a8024f0b7f493a2205afd1d90495f01151 SHA1 (patch-xenstore_Makefile) = 4fa0ed7b76a96011c3cca9c5017be4b5151489f7 diff --git a/sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile b/sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile index 3a438ef3676..617c96d8b2d 100644 --- a/sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile +++ b/sysutils/xentools41/patches/patch-xenstat_libxenstat_Makefile @@ -1,8 +1,17 @@ -$NetBSD: patch-xenstat_libxenstat_Makefile,v 1.1 2013/04/11 19:57:53 joerg Exp $ +$NetBSD: patch-xenstat_libxenstat_Makefile,v 1.2 2014/05/14 20:22:41 bouyer Exp $ --- xenstat/libxenstat/Makefile.orig 2013-03-25 19:37:42.000000000 +0000 +++ xenstat/libxenstat/Makefile -@@ -57,13 +57,13 @@ $(SHLIB): $(OBJECTS-y) +@@ -40,7 +40,7 @@ + LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ + LDLIBS-y = -lxenstore -lxenctrl + LDLIBS-$(CONFIG_SunOS) += -lkstat +-ARLIBS-y = $(XEN_XENSTORE)/libxenstore.so $(XEN_LIBXC)/libxenctrl.so ++ARLIBS-y = + ARLIBS-x86_64 = /usr/lib/amd64/libkstat.so + ARLIBS-x86_32 = /usr/lib/libkstat.so + ARLIBS-$(CONFIG_SunOS) += $(ARLIBS-$(XEN_TARGET_ARCH)) +@@ -57,13 +57,13 @@ $(OBJECTS-y) $(LDLIBS-y) src/xenstat.o: src/xenstat.c src/xenstat.h src/xenstat_priv.h diff --git a/sysutils/xentools41/patches/patch-xenstat_xentop_Makefile b/sysutils/xentools41/patches/patch-xenstat_xentop_Makefile new file mode 100644 index 00000000000..0ccceeb4f21 --- /dev/null +++ b/sysutils/xentools41/patches/patch-xenstat_xentop_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-xenstat_xentop_Makefile,v 1.1 2014/05/14 20:22:41 bouyer Exp $ + +--- xenstat/xentop/Makefile.orig 2014-05-14 15:15:54.000000000 +0200 ++++ xenstat/xentop/Makefile 2014-05-14 15:15:56.000000000 +0200 +@@ -19,8 +19,8 @@ + else + + CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) +-LDFLAGS += -L$(XEN_LIBXENSTAT) +-LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) ++LDFLAGS += -L$(XEN_LIBXENSTAT) -L$(XEN_XENSTORE) -L$(XEN_LIBXC) ++LDLIBS += -lxenstat -lxenstore -lxenctrl $(CURSES_LIBS) $(SOCKET_LIBS) + CFLAGS += -DHOST_$(XEN_OS) + + .PHONY: all |