tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: xentools41 LDFLAGS Re: broken packages for 2012Q3



On Sun, Sep 30, 2012 at 12:09:52AM +0200, Manuel Bouyer wrote:
> > As the message said, the problem is that it has rpath entries relative
> > to ${WRKSRC}.
> 
> Yes, I understand that.
> 
> > I don't want to debug the CAML mess either.
> 
> But this is where the problem is. I don't know how to tell ocaml to do
> a -Wl,-R ...

A crude workadound is attached. It avoids compiling the whole ocaml stuff.
I checked that I could still start xend, use xm and start a domU ...

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools41/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile    23 Sep 2012 15:10:44 -0000      1.22
+++ Makefile    29 Sep 2012 23:21:58 -0000
@@ -7,7 +7,7 @@
 PKGNAME=               xentools41-${VERSION}
 CATEGORIES=            sysutils
 MASTER_SITES=  http://bits.xensource.com/oss-xen/release/${VERSION}/
-PKGREVISION=   1
+PKGREVISION=   2
 
 DISTFILES=             ${DISTNAME}.tar.gz
 DISTFILES+=            ipxe-git-v1.0.0.tar.gz
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools41/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST       7 May 2011 18:39:05 -0000       1.4
+++ PLIST       29 Sep 2012 23:21:58 -0000
@@ -140,84 +140,6 @@
 lib/libxlutil.so
 lib/libxlutil.so.1.0
 lib/libxlutil.so.1.0.0
-lib/ocaml/site-lib/eventchn/META
-lib/ocaml/site-lib/eventchn/dlleventchn_stubs.so
-lib/ocaml/site-lib/eventchn/eventchn.a
-lib/ocaml/site-lib/eventchn/eventchn.cma
-lib/ocaml/site-lib/eventchn/eventchn.cmi
-lib/ocaml/site-lib/eventchn/eventchn.cmx
-lib/ocaml/site-lib/eventchn/eventchn.cmxa
-lib/ocaml/site-lib/eventchn/libeventchn_stubs.a
-lib/ocaml/site-lib/log/META
-lib/ocaml/site-lib/log/dllsyslog_stubs.so
-lib/ocaml/site-lib/log/libsyslog_stubs.a
-lib/ocaml/site-lib/log/log.a
-lib/ocaml/site-lib/log/log.cma
-lib/ocaml/site-lib/log/log.cmi
-lib/ocaml/site-lib/log/log.cmx
-lib/ocaml/site-lib/log/log.cmxa
-lib/ocaml/site-lib/log/logs.cmi
-lib/ocaml/site-lib/log/logs.cmx
-lib/ocaml/site-lib/log/syslog.cmi
-lib/ocaml/site-lib/log/syslog.cmx
-lib/ocaml/site-lib/mmap/META
-lib/ocaml/site-lib/mmap/dllmmap_stubs.so
-lib/ocaml/site-lib/mmap/libmmap_stubs.a
-lib/ocaml/site-lib/mmap/mmap.a
-lib/ocaml/site-lib/mmap/mmap.cma
-lib/ocaml/site-lib/mmap/mmap.cmi
-lib/ocaml/site-lib/mmap/mmap.cmx
-lib/ocaml/site-lib/mmap/mmap.cmxa
-lib/ocaml/site-lib/uuid/META
-lib/ocaml/site-lib/uuid/uuid.a
-lib/ocaml/site-lib/uuid/uuid.cma
-lib/ocaml/site-lib/uuid/uuid.cmi
-lib/ocaml/site-lib/uuid/uuid.cmx
-lib/ocaml/site-lib/uuid/uuid.cmxa
-lib/ocaml/site-lib/xb/META
-lib/ocaml/site-lib/xb/dllxb_stubs.so
-lib/ocaml/site-lib/xb/libxb_stubs.a
-lib/ocaml/site-lib/xb/op.cmi
-lib/ocaml/site-lib/xb/op.cmx
-lib/ocaml/site-lib/xb/packet.cmi
-lib/ocaml/site-lib/xb/packet.cmx
-lib/ocaml/site-lib/xb/partial.cmx
-lib/ocaml/site-lib/xb/xb.a
-lib/ocaml/site-lib/xb/xb.cma
-lib/ocaml/site-lib/xb/xb.cmi
-lib/ocaml/site-lib/xb/xb.cmx
-lib/ocaml/site-lib/xb/xb.cmxa
-lib/ocaml/site-lib/xb/xs_ring.cmx
-lib/ocaml/site-lib/xc/META
-lib/ocaml/site-lib/xc/dllxc_stubs.so
-lib/ocaml/site-lib/xc/libxc_stubs.a
-lib/ocaml/site-lib/xc/xc.a
-lib/ocaml/site-lib/xc/xc.cma
-lib/ocaml/site-lib/xc/xc.cmi
-lib/ocaml/site-lib/xc/xc.cmx
-lib/ocaml/site-lib/xc/xc.cmxa
-lib/ocaml/site-lib/xl/META
-lib/ocaml/site-lib/xl/dllxl_stubs.so
-lib/ocaml/site-lib/xl/libxl_stubs.a
-lib/ocaml/site-lib/xl/xl.a
-lib/ocaml/site-lib/xl/xl.cma
-lib/ocaml/site-lib/xl/xl.cmi
-lib/ocaml/site-lib/xl/xl.cmx
-lib/ocaml/site-lib/xl/xl.cmxa
-lib/ocaml/site-lib/xs/META
-lib/ocaml/site-lib/xs/queueop.cmx
-lib/ocaml/site-lib/xs/xs.a
-lib/ocaml/site-lib/xs/xs.cma
-lib/ocaml/site-lib/xs/xs.cmi
-lib/ocaml/site-lib/xs/xs.cmx
-lib/ocaml/site-lib/xs/xs.cmxa
-lib/ocaml/site-lib/xs/xs.mli
-lib/ocaml/site-lib/xs/xsraw.cmi
-lib/ocaml/site-lib/xs/xsraw.cmx
-lib/ocaml/site-lib/xs/xsraw.mli
-lib/ocaml/site-lib/xs/xst.cmi
-lib/ocaml/site-lib/xs/xst.cmx
-lib/ocaml/site-lib/xs/xst.mli
 ${PYSITELIB}/fsimage.so
 ${PYSITELIB}/grub/ExtLinuxConf.py
 ${PYSITELIB}/grub/ExtLinuxConf.pyc
@@ -652,7 +574,6 @@
 sbin/gtraceview
 sbin/img2qcow
 sbin/kdd
-sbin/oxenstored
 sbin/qcow-create
 sbin/qcow2raw
 sbin/tapdisk
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools41/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- distinfo    12 Sep 2012 11:09:32 -0000      1.22
+++ distinfo    29 Sep 2012 23:21:58 -0000
@@ -12,7 +12,7 @@
 SHA1 (patch-ab) = 0906a5ec3a7450fc987b01289e2560e60966d00d
 SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb
 SHA1 (patch-ad) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175
-SHA1 (patch-ae) = 400bd6cac23af1e75f45c3e4e88e3130a3517129
+SHA1 (patch-ae) = e54e81c7a8321ef5549af74f976e87048cda45c8
 SHA1 (patch-af) = e866e7d96766b735a53432350275810803eeb510
 SHA1 (patch-ag) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8
 SHA1 (patch-ah) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools41/patches/patch-ae,v
retrieving revision 1.2
diff -u -r1.2 patch-ae
--- patches/patch-ae    14 Dec 2011 04:01:37 -0000      1.2
+++ patches/patch-ae    29 Sep 2012 23:21:58 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-ae,v 1.2 2011/12/14 04:01:37 sbd Exp $
 
---- Makefile.orig      2011-10-20 17:05:41.000000000 +0000
-+++ Makefile
-@@ -24,7 +24,8 @@ SUBDIRS-$(CONFIG_Linux) += memshr
+--- Makefile.orig      2012-08-10 15:51:25.000000000 +0200
++++ Makefile   2012-09-30 00:27:21.000000000 +0200
+@@ -24,7 +24,8 @@
  SUBDIRS-$(CONFIG_Linux) += blktap
  SUBDIRS-$(CONFIG_Linux) += blktap2
  SUBDIRS-$(CONFIG_NetBSD) += libaio
@@ -12,3 +12,12 @@
  SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
  SUBDIRS-y += libfsimage
  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
+@@ -45,7 +46,7 @@
+ ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
+ SUBDIRS-$(PYTHON_TOOLS) += python
+ SUBDIRS-$(PYTHON_TOOLS) += pygrub
+-SUBDIRS-$(OCAML_TOOLS) += ocaml
++#SUBDIRS-$(OCAML_TOOLS) += ocaml
+ endif
+ 
+ # For the sake of linking, set the sys-root


Home | Main Index | Thread Index | Old Index