libselinux pkgconfig does not work correctly on lib64 machines.

libselinux pkgconfig does not work correctly on lib64 machines.

[Daniel J Walsh]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: selinux_pkgconfig.patch --]
[-- Type: text/plain, Size: 3072 bytes --]

diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
index cfd72e2..bf665ab 100644
--- a/libselinux/src/Makefile
+++ b/libselinux/src/Makefile
@@ -11,6 +11,7 @@ RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
 RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
 RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
 RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+LIBBASE=$(shell basename $(LIBDIR))
 
 VERSION = $(shell cat ../VERSION)
 LIBVERSION = 1
@@ -85,7 +86,7 @@ $(LIBSO): $(LOBJS)
 	ln -sf $@ $(TARGET) 
 
 $(LIBPC): $(LIBPC).in
-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
 
 selinuxswig_python_exception.i: ../include/selinux/selinux.h
 	bash exception.sh > $@ 
diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile
index 67afc60..003b6f2 100644
--- a/libsemanage/src/Makefile
+++ b/libsemanage/src/Makefile
@@ -10,6 +10,7 @@ RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
 RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
 RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
 RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+LIBBASE=$(shell basename $(LIBDIR))
 
 DEFAULT_SEMANAGE_CONF_LOCATION=$(DESTDIR)/etc/selinux/semanage.conf
 
@@ -47,7 +48,7 @@ OBJS= $(patsubst %.c,%.o,$(SRCS)) conf-scan.o conf-parse.o
 LOBJS= $(patsubst %.c,%.lo,$(SRCS)) conf-scan.lo conf-parse.lo
 CFLAGS ?= -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter
 
-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE 
+override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -fPIC
 
 SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
 
@@ -82,7 +83,7 @@ $(LIBSO): $(LOBJS)
 	ln -sf $@ $(TARGET)
 
 $(LIBPC): $(LIBPC).in
-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
 
 conf-scan.c: conf-scan.l conf-parse.h
 	$(LEX) $(LFLAGS) -t $< > $@
diff --git a/libsepol/src/Makefile b/libsepol/src/Makefile
index 3b19e37..73fdef8 100644
--- a/libsepol/src/Makefile
+++ b/libsepol/src/Makefile
@@ -3,6 +3,7 @@ PREFIX ?= $(DESTDIR)/usr
 INCLUDEDIR ?= $(PREFIX)/include
 LIBDIR ?= $(PREFIX)/lib
 SHLIBDIR ?= $(DESTDIR)/lib
+LIBBASE=$(shell basename $(LIBDIR))
 
 VERSION = $(shell cat ../VERSION)
 LIBVERSION = 1
@@ -27,7 +28,7 @@ $(LIBSO): $(LOBJS)
 	ln -sf $@ $(TARGET) 
 
 $(LIBPC): $(LIBPC).in
-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
 
 %.o:  %.c 
 	$(CC) $(CFLAGS) -fPIC -c -o $@ $<

updated libselinux pkgconfig does not work correctly on lib64 machines.

[Daniel J Walsh]

[-- Attachment #1: Type: text/plain, Size: 99 bytes --]

On 02/24/2010 02:24 PM, Daniel J Walsh wrote:
>
Ignore the first patch it was missing pc.in files.

[-- Attachment #2: selinux_pkgconfig.patch --]
[-- Type: text/plain, Size: 4098 bytes --]

diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
index cfd72e2..bf665ab 100644
--- a/libselinux/src/Makefile
+++ b/libselinux/src/Makefile
@@ -11,6 +11,7 @@ RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
 RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
 RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
 RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+LIBBASE=$(shell basename $(LIBDIR))
 
 VERSION = $(shell cat ../VERSION)
 LIBVERSION = 1
@@ -85,7 +86,7 @@ $(LIBSO): $(LOBJS)
 	ln -sf $@ $(TARGET) 
 
 $(LIBPC): $(LIBPC).in
-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
 
 selinuxswig_python_exception.i: ../include/selinux/selinux.h
 	bash exception.sh > $@ 
diff --git a/libselinux/src/libselinux.pc.in b/libselinux/src/libselinux.pc.in
index 9b3808b..5691559 100644
--- a/libselinux/src/libselinux.pc.in
+++ b/libselinux/src/libselinux.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@libdir@
 includedir=@includedir@
 
 Name: libselinux
diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile
index 67afc60..003b6f2 100644
--- a/libsemanage/src/Makefile
+++ b/libsemanage/src/Makefile
@@ -10,6 +10,7 @@ RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")')
 RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
 RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
 RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+LIBBASE=$(shell basename $(LIBDIR))
 
 DEFAULT_SEMANAGE_CONF_LOCATION=$(DESTDIR)/etc/selinux/semanage.conf
 
@@ -47,7 +48,7 @@ OBJS= $(patsubst %.c,%.o,$(SRCS)) conf-scan.o conf-parse.o
 LOBJS= $(patsubst %.c,%.lo,$(SRCS)) conf-scan.lo conf-parse.lo
 CFLAGS ?= -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wno-unused-parameter
 
-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE 
+override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -fPIC
 
 SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
 
@@ -82,7 +83,7 @@ $(LIBSO): $(LOBJS)
 	ln -sf $@ $(TARGET)
 
 $(LIBPC): $(LIBPC).in
-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
 
 conf-scan.c: conf-scan.l conf-parse.h
 	$(LEX) $(LFLAGS) -t $< > $@
diff --git a/libsemanage/src/libsemanage.pc.in b/libsemanage/src/libsemanage.pc.in
index d0945f8..81e1805 100644
--- a/libsemanage/src/libsemanage.pc.in
+++ b/libsemanage/src/libsemanage.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@libdir@
 includedir=@includedir@
 
 Name: libsemanage
diff --git a/libsepol/src/Makefile b/libsepol/src/Makefile
index 3b19e37..73fdef8 100644
--- a/libsepol/src/Makefile
+++ b/libsepol/src/Makefile
@@ -3,6 +3,7 @@ PREFIX ?= $(DESTDIR)/usr
 INCLUDEDIR ?= $(PREFIX)/include
 LIBDIR ?= $(PREFIX)/lib
 SHLIBDIR ?= $(DESTDIR)/lib
+LIBBASE=$(shell basename $(LIBDIR))
 
 VERSION = $(shell cat ../VERSION)
 LIBVERSION = 1
@@ -27,7 +28,7 @@ $(LIBSO): $(LOBJS)
 	ln -sf $@ $(TARGET) 
 
 $(LIBPC): $(LIBPC).in
-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
 
 %.o:  %.c 
 	$(CC) $(CFLAGS) -fPIC -c -o $@ $<
diff --git a/libsepol/src/libsepol.pc.in b/libsepol/src/libsepol.pc.in
index bc7635c..e52f589 100644
--- a/libsepol/src/libsepol.pc.in
+++ b/libsepol/src/libsepol.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@libdir@
 includedir=@includedir@
 
 Name: libsepol

Re: updated libselinux pkgconfig does not work correctly on lib64 machines.

[Joshua Brindle]

Daniel J Walsh wrote:
> On 02/24/2010 02:24 PM, Daniel J Walsh wrote:
> Ignore the first patch it was missing pc.in files. 

I am completely new to libtool. Does this seem reasonable Eamon?

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: updated libselinux pkgconfig does not work correctly on lib64 machines.

[Eamon Walsh]

On 02/25/2010 08:44 PM, Joshua Brindle wrote:
> Daniel J Walsh wrote:
>   
>> On 02/24/2010 02:24 PM, Daniel J Walsh wrote:
>> Ignore the first patch it was missing pc.in files. 
>>     
> I am completely new to libtool. Does this seem reasonable Eamon?
>   


I don't see any reference to "lib64" anywhere in our Makefiles even with
the patch.  We have "lib" hard-coded, and I just checked a 64-bit
machine and our stuff is in /usr/lib instead of /usr/lib64.  Is that
what this patch is trying to solve?


-- 

Eamon Walsh 
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: updated libselinux pkgconfig does not work correctly on lib64 machines.

[Daniel J Walsh]

On 02/26/2010 01:10 PM, Eamon Walsh wrote:
> On 02/25/2010 08:44 PM, Joshua Brindle wrote:
>    
>> Daniel J Walsh wrote:
>>
>>      
>>> On 02/24/2010 02:24 PM, Daniel J Walsh wrote:
>>> Ignore the first patch it was missing pc.in files.
>>>
>>>        
>> I am completely new to libtool. Does this seem reasonable Eamon?
>>
>>      
>
> I don't see any reference to "lib64" anywhere in our Makefiles even with
> the patch.  We have "lib" hard-coded, and I just checked a 64-bit
> machine and our stuff is in /usr/lib instead of /usr/lib64.  Is that
> what this patch is trying to solve?
>
>
>    
Yes

If you execute

make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install

It should do the right thing with the patch.

This is what the spec file hands in.




--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: updated libselinux pkgconfig does not work correctly on lib64 machines.

[Eamon Walsh]

On 02/26/2010 02:49 PM, Daniel J Walsh wrote:
> On 02/26/2010 01:10 PM, Eamon Walsh wrote:
>   
>> On 02/25/2010 08:44 PM, Joshua Brindle wrote:
>>    
>>     
>>> Daniel J Walsh wrote:
>>>
>>>      
>>>       
>>>> On 02/24/2010 02:24 PM, Daniel J Walsh wrote:
>>>> Ignore the first patch it was missing pc.in files.
>>>>
>>>>        
>>>>         
>>> I am completely new to libtool. Does this seem reasonable Eamon?
>>>
>>>      
>>>       
>> I don't see any reference to "lib64" anywhere in our Makefiles even with
>> the patch.  We have "lib" hard-coded, and I just checked a 64-bit
>> machine and our stuff is in /usr/lib instead of /usr/lib64.  Is that
>> what this patch is trying to solve?
>>
>>
>>    
>>     
> Yes
>
> If you execute
>
> make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install
>
> It should do the right thing with the patch.
>
> This is what the spec file hands in.
>   

OK, that makes sense.

The patch contains a stray line involving adding -fPIC to CFLAGS.  I
don't think that was meant to be part of this patch.

Otherwise,

Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov>



-- 

Eamon Walsh 
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: updated libselinux pkgconfig does not work correctly on lib64 machines.

[Joshua Brindle]

Eamon Walsh wrote:
> On 02/26/2010 02:49 PM, Daniel J Walsh wrote:
>> On 02/26/2010 01:10 PM, Eamon Walsh wrote:
>>
>>> On 02/25/2010 08:44 PM, Joshua Brindle wrote:
>>>
>>>
>>>> Daniel J Walsh wrote:
>>>>
>>>>
>>>>
>>>>> On 02/24/2010 02:24 PM, Daniel J Walsh wrote:
>>>>> Ignore the first patch it was missing pc.in files.
>>>>>
>>>>>
>>>>>
>>>> I am completely new to libtool. Does this seem reasonable Eamon?
>>>>
>>>>
>>>>
>>> I don't see any reference to "lib64" anywhere in our Makefiles even with
>>> the patch.  We have "lib" hard-coded, and I just checked a 64-bit
>>> machine and our stuff is in /usr/lib instead of /usr/lib64.  Is that
>>> what this patch is trying to solve?
>>>
>>>
>>>
>>>
>> Yes
>>
>> If you execute
>>
>> make LIBDIR=/usr/lib64 SHLIBDIR=/lib64 install
>>
>> It should do the right thing with the patch.
>>
>> This is what the spec file hands in.
>>
>
> OK, that makes sense.
>
> The patch contains a stray line involving adding -fPIC to CFLAGS.  I
> don't think that was meant to be part of this patch.
>
> Otherwise,
>
> Acked-by: Eamon Walsh<ewalsh@tycho.nsa.gov>
>
>

Merged in libselinux 2.0.92

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.