[Olsr-dev] [PATCH v1 1/5] linux: use /usr/lib64 on 64bit machines

[Hans-Christoph Steiner]

Yeah, sorry, I saw that after I sent this.  That seems like a workable solution.

.hc

On May 10, 2012, at 5:29 PM, Ferry Huberts wrote:

> hence my followup patch
> 
> the new patch only use lib64 when it already exists
> pls look at it ;-)
> 
> On 10-05-12 23:18, Hans-Christoph Steiner wrote:
>> 
>> Since this is something specific to Fedora, it should be handled there.  Debian and derivs do it differently, and you also have to consider OpenWRT and other embedded systems where olsrd is commonly used.
>> 
>> Debian/stable includes it only as a symlink:
>> (spam-protected):~$ ls -ld /usr/lib*
>> drwxr-xr-x 70 root root 45056 May  9 15:18 /usr/lib
>> lrwxrwxrwx  1 root root     3 Feb 26  2011 /usr/lib64 ->  lib
>> 
>> Debian/testing does not have it at all:
>> (spam-protected):~$ ls -dl /usr/lib*
>> drwxr-xr-x 64 root root 28672 May  9 06:30 /usr/lib
>> 
>> .hc
>> 
>> On May 10, 2012, at 3:51 PM, Ferry Huberts wrote:
>> 
>>> 
>>> I don't agree, because on my Fedora system I have /usr/lib for 32bit binaries and /usr/lib64 for 64 bit binaries.
>>> If I use /usr/lib them this will clash if I want to have both versions installed at the same time.
>>> 
>>> 
>>> On 10-05-12 21:11, Hans-Christoph Steiner wrote:
>>>> 
>>>> /usr/lib64 was a temporary thing only for supporting having both 32-bit and 64-bit packages installed at the same time.  In Debian at least, they've abstracted it away, so you only need to think about /usr/lib for situations like these.
>>>> 
>>>> I don't think we need this patch included in olsrd itself, I think it should just be /usr/lib.  Then the packager should change it depending on the system they are packaging for.
>>>> 
>>>> .hc
>>>> 
>>>> On May 10, 2012, at 1:11 PM, Henning Rogge wrote:
>>>> 
>>>>> Just found the problem I think...
>>>>> 
>>>>> Ubuntu (and most likely Debian too) have no /usr/lib64. Even on a 64 bit system.
>>>>> 
>>>>> Henning
>>>>> 
>>>>> On Thu, May 10, 2012 at 7:09 PM, Ferry Huberts<(spam-protected)>   wrote:
>>>>>> 
>>>>>> 
>>>>>> On 10-05-12 18:53, Henning Rogge wrote:
>>>>>>> 
>>>>>>> I think there was a reason why this was removed ages ago... but the
>>>>>>> reason might have died ages ago too.
>>>>>>> 
>>>>>>> Is there still a distribution that does have 64 bit support but no
>>>>>>> /usr/lib64 directory?
>>>>>>> 
>>>>>> 
>>>>>> currently /usr/lib is used on all architectures.
>>>>>> this patch is to use /usr/lib64 on 64 bit
>>>>>> 
>>>>>> 
>>>>>>> Henning
>>>>>>> On Thu, May 10, 2012 at 4:09 PM, Ferry Huberts<(spam-protected)>    wrote:
>>>>>>>> 
>>>>>>>> From: Ferry Huberts<(spam-protected)>
>>>>>>>> 
>>>>>>>> Signed-off-by: Ferry Huberts<(spam-protected)>
>>>>>>>> ---
>>>>>>>>  make/Makefile.linux |    4 ++++
>>>>>>>>  1 files changed, 4 insertions(+), 0 deletions(-)
>>>>>>>> 
>>>>>>>> diff --git a/make/Makefile.linux b/make/Makefile.linux
>>>>>>>> index e73be7c..a37110d 100644
>>>>>>>> --- a/make/Makefile.linux
>>>>>>>> +++ b/make/Makefile.linux
>>>>>>>> @@ -4,7 +4,11 @@
>>>>>>>> 
>>>>>>>>  ARCH := $(shell uname -m)
>>>>>>>>  DESTDIR ?=
>>>>>>>> +ifeq ($(strip $(ARCH)),x86_64)
>>>>>>>> +LIBDIR =       $(DESTDIR)/usr/lib64
>>>>>>>> +else
>>>>>>>>  LIBDIR =       $(DESTDIR)/usr/lib
>>>>>>>> +endif
>>>>>>>> 
>>>>>>>>  SRCS +=        $(wildcard src/linux/*.c src/unix/*.c)
>>>>>>>>  HDRS +=                $(wildcard src/linux/*.h src/unix/*.h)
>>>>>>>> --
>>>>>>>> 1.7.7.6
>>>>>>>> 
>>>>>>>> 
>>>>>>>> --
>>>>>>>> Olsr-dev mailing list
>>>>>>>> (spam-protected)
>>>>>>>> https://lists.olsr.org/mailman/listinfo/olsr-dev
>>>>>>> 
>>>>>>> 
>>>>>>> 
>>>>>>> 
>>>>>> 
>>>>>> --
>>>>>> Ferry Huberts
>>>>> 
>>>>> 
>>>>> 
>>>>> --
>>>>> Steven Hawkings about cosmic inflation: "An increase of billions of
>>>>> billions of percent in a tiny fraction of a second. Of course, that
>>>>> was before the present government."
>>>>> 
>>>>> --
>>>>> Olsr-dev mailing list
>>>>> (spam-protected)
>>>>> https://lists.olsr.org/mailman/listinfo/olsr-dev
>>> 
>>> --
>>> Ferry Huberts
> 
> -- 
> Ferry Huberts