[Glibc-bsd-commits] r5229 - in trunk/freebsd-libs/debian: . patches

rmh at alioth.debian.org rmh at alioth.debian.org
Sun Dec 8 23:01:57 UTC 2013 

Author: rmh
Date: 2013-12-08 23:01:57 +0000 (Sun, 08 Dec 2013)
New Revision: 5229

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/libipx-dev.install
   trunk/freebsd-libs/debian/patches/05_libipx.diff
   trunk/freebsd-libs/debian/patches/makefiles.diff
   trunk/freebsd-libs/debian/rules
Log:
Make libipx available on all architectures.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-12-08 22:18:55 UTC (rev 5228)
+++ trunk/freebsd-libs/debian/changelog	2013-12-08 23:01:57 UTC (rev 5229)
@@ -1,7 +1,8 @@
-freebsd-libs (9.2+ds2-3) UNRELEASED; urgency=low
+freebsd-libs (9.2+ds3-1) UNRELEASED; urgency=low
 
   * Fetch source code securely (https) in get-orig-source.
   * Leave -lbsdxml untouched (latest freebsd-glue supports it).
+  * Make libipx available on all architectures.
 
  -- Robert Millan <rmh at debian.org>  Sat, 07 Dec 2013 23:22:56 +0100
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2013-12-08 22:18:55 UTC (rev 5228)
+++ trunk/freebsd-libs/debian/control	2013-12-08 23:01:57 UTC (rev 5229)
@@ -260,14 +260,14 @@
  compile applications that use libnetgraph.
 
 Package: libipx2
-Architecture: kfreebsd-any
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: FreeBSD IPX address conversion support library
  The IPX library provides a set of routune to convert IPX addresses.
 
 Package: libipx-dev
 Section: libdevel
-Architecture: kfreebsd-any
+Architecture: any
 Depends: libipx2 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
 Description: Development files for libipx
  This package contains the header files and static library needed to

Modified: trunk/freebsd-libs/debian/libipx-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libipx-dev.install	2013-12-08 22:18:55 UTC (rev 5228)
+++ trunk/freebsd-libs/debian/libipx-dev.install	2013-12-08 23:01:57 UTC (rev 5229)
@@ -1,5 +1,6 @@
 usr/lib/libipx*.so
 usr/lib/libipx.a
+usr/include/ipx.h
 usr/share/man/man3/ipx.3.gz
 usr/share/man/man3/ipx_addr.3.gz
 usr/share/man/man3/ipx_ntoa.3.gz

Modified: trunk/freebsd-libs/debian/patches/05_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_libipx.diff	2013-12-08 22:18:55 UTC (rev 5228)
+++ trunk/freebsd-libs/debian/patches/05_libipx.diff	2013-12-08 23:01:57 UTC (rev 5229)
@@ -1,9 +1,7 @@
----
- lib/libipx/Makefile |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/lib/libipx/Makefile
-+++ b/lib/libipx/Makefile
+Index: freebsd-libs-9.2+ds2/lib/libipx/Makefile
+===================================================================
+--- freebsd-libs-9.2+ds2.orig/lib/libipx/Makefile	2013-12-08 23:43:09.353946412 +0100
++++ freebsd-libs-9.2+ds2/lib/libipx/Makefile	2013-12-08 23:48:44.000000000 +0100
 @@ -1,6 +1,7 @@
  # $FreeBSD$
  
@@ -12,3 +10,24 @@
  SHLIBDIR?= /lib
  SRCS=	ipx_addr.c ipx_ntoa.c
  MAN=	ipx.3
+Index: freebsd-libs-9.2+ds2/sys/netipx/ipx.h
+===================================================================
+--- freebsd-libs-9.2+ds2.orig/sys/netipx/ipx.h	2007-06-13 16:01:43.000000000 +0200
++++ freebsd-libs-9.2+ds2/sys/netipx/ipx.h	2013-12-08 23:50:47.489929732 +0100
+@@ -146,6 +146,7 @@
+ 	u_short		x_port;
+ };
+ 
++#ifdef __FreeBSD_kernel__
+ /*
+  * Socket address
+  */
+@@ -156,6 +157,8 @@
+ 	char		sipx_zero[2];
+ };
+ #define sipx_port sipx_addr.x_port
++#endif
++
+ 
+ /*
+  * Definitions for IPX Internetwork Packet Exchange Protocol

Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff	2013-12-08 22:18:55 UTC (rev 5228)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff	2013-12-08 23:01:57 UTC (rev 5229)
@@ -48,8 +48,10 @@
  CFLAGS+= -DLIBC_SCCS
  
  .if ${MK_INET6_SUPPORT} != "no"
---- a/lib/libkvm/Makefile
-+++ b/lib/libkvm/Makefile
+Index: freebsd-libs-9.2+ds2/lib/libkvm/Makefile
+===================================================================
+--- freebsd-libs-9.2+ds2.orig/lib/libkvm/Makefile	2013-12-08 23:51:03.057927202 +0100
++++ freebsd-libs-9.2+ds2/lib/libkvm/Makefile	2013-12-08 23:51:03.033927203 +0100
 @@ -4,6 +4,7 @@
  LIB=	kvm
  SHLIBDIR?= /lib
@@ -58,3 +60,18 @@
  
  .if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c)
  KVM_ARCH=${MACHINE_ARCH}
+Index: freebsd-libs-9.2+ds2/lib/libipx/Makefile
+===================================================================
+--- freebsd-libs-9.2+ds2.orig/lib/libipx/Makefile	2013-12-08 23:51:03.057927202 +0100
++++ freebsd-libs-9.2+ds2/lib/libipx/Makefile	2013-12-08 23:51:35.729926664 +0100
+@@ -7,6 +7,10 @@
+ MAN=	ipx.3
+ MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
+ 
++# for <netipx/ipx.h>
++CFLAGS+=	-I../../sys
++INCS+=		../../sys/netipx/ipx.h
++
+ WARNS?=	2
+ 
+ .include <bsd.lib.mk>

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2013-12-08 22:18:55 UTC (rev 5228)
+++ trunk/freebsd-libs/debian/rules	2013-12-08 23:01:57 UTC (rev 5229)
@@ -57,6 +57,7 @@
 		lib/libalias sys/netinet/libalias sys/modules/libalias \
 	         sys/kern/subr_sbuf.c \
 	         sys/sys/sbuf.h \
+		sys/netipx/ipx.h \
 	         share/misc/usb_hid_usages ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
@@ -76,13 +77,13 @@
 	build-dwarf \
 	build-elf \
 	build-util \
+	build-ipx \
 	$(NULL)
 
 ifeq ($(kernel), kfreebsd)
 BUILD_ARCH_TARGETS += \
 	build-cam \
 	build-geom \
-	build-ipx \
 	build-kiconv \
 	build-kvm \
 	build-usbhid \
@@ -222,10 +223,10 @@
 	$(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libelf install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libutil install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libipx install SHLIBDIR=/lib
 ifeq ($(kernel), kfreebsd)
 	$(PMAKE) -C $(CURDIR)/lib/libcam install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libgeom install SHLIBDIR=/lib
-	$(PMAKE) -C $(CURDIR)/lib/libipx install SHLIBDIR=/lib
 	$(PMAKE) -C $(CURDIR)/lib/libkiconv install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libkvm install SHLIBDIR=/lib
 	$(PMAKE) -C $(CURDIR)/lib/libdevstat install SHLIBDIR=/usr/lib

More information about the Glibc-bsd-commits mailing list