[Glibc-bsd-commits] r3971 - in trunk/freebsd-libs/debian: . local/include local/include/sys patches

Robert Millan rmh at alioth.debian.org
Sun Jan 8 17:47:51 UTC 2012


Author: rmh
Date: 2012-01-08 17:47:51 +0000 (Sun, 08 Jan 2012)
New Revision: 3971

Added:
   trunk/freebsd-libs/debian/local/include/sys/param.h
   trunk/freebsd-libs/debian/patches/15_kkh_kludge.diff
Removed:
   trunk/freebsd-libs/debian/local/include/aio.h
   trunk/freebsd-libs/debian/local/include/asm/
   trunk/freebsd-libs/debian/local/include/bits/
   trunk/freebsd-libs/debian/local/include/linux/
   trunk/freebsd-libs/debian/local/include/netdb.h
   trunk/freebsd-libs/debian/local/include/sys/cdefs.h
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/libkvm0.symbols
   trunk/freebsd-libs/debian/libsbuf0.symbols
   trunk/freebsd-libs/debian/libusb2.symbols
   trunk/freebsd-libs/debian/libusbhid4.symbols
   trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff
   trunk/freebsd-libs/debian/patches/03_libsbuf.diff
   trunk/freebsd-libs/debian/patches/04_libkvm.diff
   trunk/freebsd-libs/debian/patches/09_libusbhid.diff
   trunk/freebsd-libs/debian/patches/10_memstat.diff
   trunk/freebsd-libs/debian/patches/12_usb.diff
   trunk/freebsd-libs/debian/patches/series
   trunk/freebsd-libs/debian/rules
Log:
New upstream snapshot

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/changelog	2012-01-08 17:47:51 UTC (rev 3971)
@@ -1,3 +1,9 @@
+freebsd-libs (8.3~svn229725-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 08 Jan 2012 18:42:53 +0100
+
 freebsd-libs (8.2+ds2-2) unstable; urgency=low
 
   * Build-depend on libncurses5-dev (for libalias).

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/control	2012-01-08 17:47:51 UTC (rev 3971)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>, Robert Millan <rmh at debian.org>
-Build-Depends: debhelper (>= 7), pkg-config, freebsd-buildutils,
+Build-Depends: debhelper (>= 7), pkg-config, freebsd-buildutils (>= 9),
  libbsd-dev (>= 0.3.0),
  libc0.1-dev (>= 2.13-0exp2) [kfreebsd-any],
  libgdbm-dev [kfreebsd-any],

Modified: trunk/freebsd-libs/debian/libkvm0.symbols
===================================================================
--- trunk/freebsd-libs/debian/libkvm0.symbols	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/libkvm0.symbols	2012-01-08 17:47:51 UTC (rev 3971)
@@ -1,5 +1,6 @@
 libkvm.so.0 libkvm0 #MINVER#
  kvm_close at Base 7.0
+ kvm_dpcpu_setcpu at Base 8.3~
  kvm_getargv at Base 7.0
  kvm_getcptime at Base 7.1
  kvm_getenvv at Base 7.0

Modified: trunk/freebsd-libs/debian/libsbuf0.symbols
===================================================================
--- trunk/freebsd-libs/debian/libsbuf0.symbols	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/libsbuf0.symbols	2012-01-08 17:47:51 UTC (rev 3971)
@@ -13,6 +13,7 @@
  sbuf_overflowed at Base 7.0
  sbuf_printf at Base 7.0
  sbuf_putc at Base 7.0
+ sbuf_set_drain at Base 8.3~
  sbuf_setpos at Base 7.0
  sbuf_trim at Base 7.0
  sbuf_vprintf at Base 7.0

Modified: trunk/freebsd-libs/debian/libusb2.symbols
===================================================================
--- trunk/freebsd-libs/debian/libusb2.symbols	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/libusb2.symbols	2012-01-08 17:47:51 UTC (rev 3971)
@@ -1,9 +1,13 @@
 libusb.so.2 libusb2 #MINVER#
+ LIBUSB20_BOS_DESCRIPTOR_FORMAT at Base 8.3~
  LIBUSB20_CONFIG_DESC_FORMAT at Base 7.1
  LIBUSB20_CONTROL_SETUP_FORMAT at Base 7.1
  LIBUSB20_DEVICE_DESC_FORMAT at Base 7.1
  LIBUSB20_ENDPOINT_DESC_FORMAT at Base 7.1
  LIBUSB20_INTERFACE_DESC_FORMAT at Base 7.1
+ LIBUSB20_SS_ENDPT_COMP_DESC_FORMAT at Base 8.3~
+ LIBUSB20_SS_USB_DEVCAP_DESC_FORMAT at Base 8.3~
+ LIBUSB20_USB_20_DEVCAP_DESC_FORMAT at Base 8.3~
  libusb20_be_add_dev_quirk at Base 7.1
  libusb20_be_alloc at Base 7.1
  libusb20_be_alloc_default at Base 7.1
@@ -36,6 +40,8 @@
  libusb20_dev_get_iface_desc at Base 7.1
  libusb20_dev_get_info at Base 7.1
  libusb20_dev_get_mode at Base 7.1
+ libusb20_dev_get_parent_address at Base 8.3~
+ libusb20_dev_get_parent_port at Base 8.3~
  libusb20_dev_get_power_mode at Base 7.1
  libusb20_dev_get_speed at Base 7.1
  libusb20_dev_kernel_driver_active at Base 7.1
@@ -50,11 +56,13 @@
  libusb20_dev_set_debug at Base 7.1
  libusb20_dev_set_power_mode at Base 7.1
  libusb20_dev_wait_process at Base 7.1
+ libusb20_error_name at Base 8.3~
  libusb20_me_decode at Base 7.1
  libusb20_me_encode at Base 7.1
  libusb20_me_get_1 at Base 7.1
  libusb20_me_get_2 at Base 7.1
  libusb20_parse_config_desc at Base 7.1
+ libusb20_strerror at Base 8.3~
  libusb20_tr_bulk_intr_sync at Base 7.1
  libusb20_tr_callback_wrapper at Base 7.1
  libusb20_tr_clear_stall_sync at Base 7.1
@@ -101,8 +109,9 @@
  libusb_control_transfer_get_data at Base 7.1
  libusb_control_transfer_get_setup at Base 7.1
  libusb_cpu_to_le16 at Base 7.1
+ libusb_detach_kernel_driver at Base 7.1
  libusb_detach_kernel_driver_np at Base 8.2
- libusb_detach_kernel_driver at Base 7.1
+ libusb_error_name at Base 8.3~
  libusb_event_handler_active at Base 7.1
  libusb_event_handling_ok at Base 7.1
  libusb_exit at Base 7.1
@@ -111,8 +120,10 @@
  libusb_fill_control_transfer at Base 7.1
  libusb_fill_interrupt_transfer at Base 7.1
  libusb_fill_iso_transfer at Base 7.1
+ libusb_free_bos_descriptor at Base 8.3~
  libusb_free_config_descriptor at Base 7.1
  libusb_free_device_list at Base 7.1
+ libusb_free_ss_endpoint_comp at Base 8.3~
  libusb_free_transfer at Base 7.1
  libusb_get_active_config_descriptor at Base 7.1
  libusb_get_bus_number at Base 7.1
@@ -124,6 +135,7 @@
  libusb_get_device_address at Base 7.1
  libusb_get_device_descriptor at Base 7.1
  libusb_get_device_list at Base 7.1
+ libusb_get_device_speed at Base 8.3~
  libusb_get_driver at Base 8.2
  libusb_get_driver_np at Base 8.2
  libusb_get_iso_packet_buffer at Base 7.1
@@ -143,6 +155,8 @@
  libusb_lock_event_waiters at Base 7.1
  libusb_open at Base 7.1
  libusb_open_device_with_vid_pid at Base 7.1
+ libusb_parse_bos_descriptor at Base 8.3~
+ libusb_parse_ss_endpoint_comp at Base 8.3~
  libusb_ref_device at Base 7.1
  libusb_release_interface at Base 7.1
  libusb_reset_device at Base 7.1
@@ -168,6 +182,7 @@
  usb_close at Base 7.1
  usb_control_msg at Base 7.1
  usb_destroy_configuration at Base 7.1
+ usb_detach_kernel_driver_np at Base 8.3~
  usb_device at Base 7.1
  usb_fetch_and_parse_descriptors at Base 7.1
  usb_find_busses at Base 7.1
@@ -175,6 +190,7 @@
  usb_get_busses at Base 7.1
  usb_get_descriptor at Base 7.1
  usb_get_descriptor_by_endpoint at Base 7.1
+ usb_get_driver_np at Base 8.3~
  usb_get_string at Base 7.1
  usb_get_string_simple at Base 7.1
  usb_init at Base 7.1

Modified: trunk/freebsd-libs/debian/libusbhid4.symbols
===================================================================
--- trunk/freebsd-libs/debian/libusbhid4.symbols	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/libusbhid4.symbols	2012-01-08 17:47:51 UTC (rev 3971)
@@ -3,6 +3,7 @@
  hid_end_parse at Base 7.0
  hid_get_data at Base 7.0
  hid_get_item at Base 7.0
+ hid_get_report at Base 8.3~
  hid_get_report_desc at Base 7.0
  hid_get_report_id at Base 7.1
  hid_init at Base 7.0
@@ -12,6 +13,7 @@
  hid_report_size at Base 7.0
  hid_set_data at Base 7.0
  hid_set_immed at Base 7.1
+ hid_set_report at Base 8.3~
  hid_start_parse at Base 7.0
  hid_usage_in_page at Base 7.0
  hid_usage_page at Base 7.0

Deleted: trunk/freebsd-libs/debian/local/include/aio.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/aio.h	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/local/include/aio.h	2012-01-08 17:47:51 UTC (rev 3971)
@@ -1,3 +0,0 @@
-#undef __unused
-#include_next <aio.h>
-#include <sys/cdefs.h>

Deleted: trunk/freebsd-libs/debian/local/include/netdb.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/netdb.h	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/local/include/netdb.h	2012-01-08 17:47:51 UTC (rev 3971)
@@ -1,3 +0,0 @@
-#undef __unused
-#include_next <netdb.h>
-#include <sys/cdefs.h>

Deleted: trunk/freebsd-libs/debian/local/include/sys/cdefs.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/sys/cdefs.h	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/local/include/sys/cdefs.h	2012-01-08 17:47:51 UTC (rev 3971)
@@ -1,4 +0,0 @@
-#include_next <sys/cdefs.h>
-#ifndef __unused
-#define __unused __attribute__((unused))
-#endif

Added: trunk/freebsd-libs/debian/local/include/sys/param.h
===================================================================
--- trunk/freebsd-libs/debian/local/include/sys/param.h	                        (rev 0)
+++ trunk/freebsd-libs/debian/local/include/sys/param.h	2012-01-08 17:47:51 UTC (rev 3971)
@@ -0,0 +1,5 @@
+#ifndef _SYS_PARAM_H_
+#define _SYS_PARAM_H_
+#include_next <sys/param.h>
+#define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
+#endif

Modified: trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/patches/00_sbuf_page_size.diff	2012-01-08 17:47:51 UTC (rev 3971)
@@ -1,6 +1,6 @@
 --- a/sys/kern/subr_sbuf.c
 +++ b/sys/kern/subr_sbuf.c
-@@ -77,8 +77,14 @@
+@@ -84,8 +84,14 @@
  #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)
  
  #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */

Modified: trunk/freebsd-libs/debian/patches/03_libsbuf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/03_libsbuf.diff	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/patches/03_libsbuf.diff	2012-01-08 17:47:51 UTC (rev 3971)
@@ -24,9 +24,9 @@
 +#include <sys/types.h>
 +#include <stdarg.h>
  
- /*
-  * Structure definition
-@@ -64,10 +65,8 @@
+ struct sbuf;
+ struct sbuf_drain_data;
+@@ -68,10 +69,8 @@
  int		 sbuf_bcpy(struct sbuf *, const void *, size_t);
  int		 sbuf_cat(struct sbuf *, const char *);
  int		 sbuf_cpy(struct sbuf *, const char *);
@@ -37,5 +37,5 @@
 +int		 sbuf_printf(struct sbuf *, const char *, ...);
 +int		 sbuf_vprintf(struct sbuf *, const char *, va_list);
  int		 sbuf_putc(struct sbuf *, int);
+ void		 sbuf_set_drain(struct sbuf *, sbuf_drain_func *, void *);
  int		 sbuf_trim(struct sbuf *);
- int		 sbuf_overflowed(struct sbuf *);

Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff	2012-01-08 17:47:51 UTC (rev 3971)
@@ -270,7 +270,7 @@
  #define	NL_CP_TIME		0
 --- a/lib/libkvm/kvm_pcpu.c
 +++ b/lib/libkvm/kvm_pcpu.c
-@@ -41,9 +41,9 @@
+@@ -48,9 +48,9 @@
  #include "kvm_private.h"
  
  static struct nlist kvm_pcpu_nl[] = {

Modified: trunk/freebsd-libs/debian/patches/09_libusbhid.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/09_libusbhid.diff	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/patches/09_libusbhid.diff	2012-01-08 17:47:51 UTC (rev 3971)
@@ -14,7 +14,7 @@
  MLINKS=	usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \
 --- a/lib/libusbhid/parse.c
 +++ b/lib/libusbhid/parse.c
-@@ -143,7 +143,7 @@
+@@ -149,7 +149,7 @@
   *	hid_start_parse
   *------------------------------------------------------------------------*/
  hid_data_t

Modified: trunk/freebsd-libs/debian/patches/10_memstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/10_memstat.diff	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/patches/10_memstat.diff	2012-01-08 17:47:51 UTC (rev 3971)
@@ -49,7 +49,7 @@
  {
 --- a/lib/libmemstat/memstat_uma.c
 +++ b/lib/libmemstat/memstat_uma.c
-@@ -50,12 +50,12 @@
+@@ -49,12 +49,12 @@
  
  static struct nlist namelist[] = {
  #define	X_UMA_KEGS	0

Modified: trunk/freebsd-libs/debian/patches/12_usb.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/12_usb.diff	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/patches/12_usb.diff	2012-01-08 17:47:51 UTC (rev 3971)
@@ -19,17 +19,6 @@
  
  MLINKS+=	libusb.3 usb.3
  
---- a/lib/libusb/libusb20.c
-+++ b/lib/libusb/libusb20.c
-@@ -1167,7 +1167,7 @@
- {
- 	struct libusb20_backend *pbe;
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- 	pbe = libusb20_be_alloc(&libusb20_ugen20_backend);
- #else
- 	pbe = NULL;
 --- a/lib/libusb/libusb.h
 +++ b/lib/libusb/libusb.h
 @@ -29,6 +29,7 @@
@@ -40,16 +29,16 @@
  
  #ifdef __cplusplus
  extern	"C" {
-@@ -220,7 +221,7 @@
+@@ -242,7 +243,7 @@
  	uint8_t	bSynchAddress;
  	uint8_t *extra;
  	int	extra_length;
 -}	libusb_endpoint_descriptor __aligned(sizeof(void *));
 +}	libusb_endpoint_descriptor __attribute__((__aligned__(sizeof(void *))));
  
- typedef struct libusb_interface_descriptor {
- 	uint8_t	bLength;
-@@ -235,12 +236,12 @@
+ typedef struct libusb_ss_endpoint_companion_descriptor {
+ 	uint8_t bLength;
+@@ -265,12 +266,12 @@
  	struct libusb_endpoint_descriptor *endpoint;
  	uint8_t *extra;
  	int	extra_length;
@@ -64,16 +53,16 @@
  
  typedef struct libusb_config_descriptor {
  	uint8_t	bLength;
-@@ -254,7 +255,7 @@
+@@ -284,7 +285,7 @@
  	struct libusb_interface *interface;
  	uint8_t *extra;
  	int	extra_length;
 -}	libusb_config_descriptor __aligned(sizeof(void *));
 +}	libusb_config_descriptor __attribute__((__aligned__(sizeof(void *))));
  
- typedef struct libusb_control_setup {
- 	uint8_t	bmRequestType;
-@@ -270,7 +271,7 @@
+ typedef struct libusb_usb_2_0_device_capability_descriptor {
+ 	uint8_t bLength;
+@@ -333,7 +334,7 @@
  	uint32_t length;
  	uint32_t actual_length;
  	enum libusb_transfer_status status;
@@ -82,7 +71,7 @@
  
  typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
  
-@@ -289,7 +290,7 @@
+@@ -352,7 +353,7 @@
  	void *os_priv;
  	int	num_iso_packets;
  	struct libusb_iso_packet_descriptor iso_packet_desc[0];
@@ -120,7 +109,7 @@
  
  #define	LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
    LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-@@ -498,7 +500,7 @@
+@@ -557,7 +559,7 @@
  struct libusb20_endpoint {
  	struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
  	struct libusb20_me_struct extra;
@@ -129,7 +118,7 @@
  
  struct libusb20_interface {
  	struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-@@ -507,14 +509,14 @@
+@@ -566,14 +568,14 @@
  	struct libusb20_endpoint *endpoints;
  	uint8_t	num_altsetting;
  	uint8_t	num_endpoints;

Added: trunk/freebsd-libs/debian/patches/15_kkh_kludge.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/15_kkh_kludge.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/15_kkh_kludge.diff	2012-01-08 17:47:51 UTC (rev 3971)
@@ -0,0 +1,15 @@
+
+USB_FS_MAX_FRAMES_PRE_SCALE is only available with
+kfreebsd-kernel-headers >= 8.3
+
+--- a/lib/libusb/libusb20_ugen20.c
++++ b/lib/libusb/libusb20_ugen20.c
+@@ -747,7 +747,7 @@
+ 	struct usb_fs_endpoint *fsep;
+ 
+ 	if (pre_scale)
+-		MaxFrameCount |= USB_FS_MAX_FRAMES_PRE_SCALE;
++		MaxFrameCount |= (1U << 31);
+ 
+ 	memset(&temp, 0, sizeof(temp));
+ 

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/patches/series	2012-01-08 17:47:51 UTC (rev 3971)
@@ -13,3 +13,4 @@
 12_usb.diff
 13_jail.diff
 14_alias.diff
+15_kkh_kludge.diff

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2012-01-08 16:13:03 UTC (rev 3970)
+++ trunk/freebsd-libs/debian/rules	2012-01-08 17:47:51 UTC (rev 3971)
@@ -10,6 +10,13 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
+svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g')
+version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
+major		:= $(shell echo $(version) | sed -e 's/\..*//g')
+revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
+
 CFLAGS = -Wall -g -pipe -fPIC -I. -I$(CURDIR)/sys -D_GNU_SOURCE \
          $(shell pkg-config --cflags libbsd-overlay) \
          -D__va_list=__builtin_va_list
@@ -21,16 +28,16 @@
 endif
 
 SOURCE = freebsd-libs
-VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-[^-]*$$/\1/p')
-SVN_REL = $(shell echo $(VERSION) | sed -ne 's/+[^+]*$$//p')
-SVN = http://svn.freebsd.org/base/release/$(SVN_REL).0
-#SVN = http://svn.freebsd.org/base/releng/8.1
-ORIGDIR = $(SOURCE)-$(VERSION)
-TARNAME = $(SOURCE)_$(VERSION).orig.tar.gz
+#SVN		:= http://svn.freebsd.org/base/release/$(version).0
+#SVN		:= http://svn.freebsd.org/base/releng/$(version)
+SVN		:= http://svn.freebsd.org/base/stable/$(major)
+#SVN		:= http://svn.freebsd.org/base/head
+ORIGDIR = $(SOURCE)-$(tar_version)
+TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 \
+PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -isystem /usr/include/freebsd -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 \
         NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) make
 export SHLIB_MAJOR = 0
 kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -48,7 +55,7 @@
 	         sys/kern/subr_sbuf.c \
 	         sys/sys/sbuf.h \
 	         share/misc/usb_hid_usages ; do \
-	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	    svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
 	# Remove unused files with non GPL compatible license (eg BSD 4 clauses)
 	rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*




More information about the Glibc-bsd-commits mailing list