Source: libselinux
Version: 2.1.0-1
Followup-For: Bug #645121

Whoops!  I attached the wrong version of the cleanup patch, sorry!
The attached incremental diff is also necessary for cross-compiling.

Cheers,
Kyle Moffett

--
Curious about my work on the Debian powerpcspe port?
I'm keeping a blog here: http://pureperl.blogspot.com/

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (700, 'testing'), (700, 'stable'), (600, 'unstable'), (500, 
'stable-updates'), (500, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -ruN libselinux-2.1.0.old/debian/patches/fix-cross-compile.patch libselinux-2.1.0/debian/patches/fix-cross-compile.patch
--- libselinux-2.1.0.old/debian/patches/fix-cross-compile.patch	1969-12-31 19:00:00.000000000 -0500
+++ libselinux-2.1.0/debian/patches/fix-cross-compile.patch	2011-10-13 17:35:37.000000000 -0400
@@ -0,0 +1,21 @@
+Description: Fix cross-compilation
+ Don't forcibly -I/usr/include during the build process, the compiler
+ already knows how to look in that directory.
+ .
+Author: Kyle Moffett <kyle.d.moff...@boeing.com>
+
+---
+Forwarded: no
+Last-Update: 2011-10-13
+
+--- libselinux-2.1.0.orig/src/Makefile
++++ libselinux-2.1.0/src/Makefile
+@@ -47,7 +47,7 @@
+ OBJS= $(patsubst %.c,%.o,$(SRCS))
+ LOBJS= $(patsubst %.c,%.lo,$(SRCS))
+ CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute
+-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS)
++override CFLAGS += -I../include -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS)
+ RANLIB=ranlib
+ 
+ ARCH := $(patsubst i%86,i386,$(shell uname -m))
diff -ruN libselinux-2.1.0.old/debian/patches/series libselinux-2.1.0/debian/patches/series
--- libselinux-2.1.0.old/debian/patches/series	2011-10-13 17:36:38.000000000 -0400
+++ libselinux-2.1.0/debian/patches/series	2011-10-13 17:36:58.000000000 -0400
@@ -1,3 +1,4 @@
 fix-makefile-bugs.patch -p1
 fix-manpages.patch -p1
 hide-library-destructors.patch -p1
+fix-cross-compile.patch -p1
diff -ruN libselinux-2.1.0.old/debian/rules libselinux-2.1.0/debian/rules
--- libselinux-2.1.0.old/debian/rules	2011-10-13 14:47:03.000000000 -0400
+++ libselinux-2.1.0/debian/rules	2011-10-13 17:46:59.000000000 -0400
@@ -33,7 +33,7 @@
 
 ## Skip python/ruby packages during stage1 build
 ifeq ($(DEB_STAGE),stage1)
-DH_OPTIONS += -Npython-selinux -Nruby-selinux
+DH_OPTIONS += -Npython-selinux -Nruby-selinux -Nlibselinux-ruby1.8
 endif
 
 ## Set up some variables to be passed to the upstream Makefile

Reply via email to