[Olsr-dev] [PATCH v2 1/2] linux: use /usr/lib64 on 64bit machines if it exists

Ferry Huberts (spam-protected)
Fri May 11 12:26:20 CEST 2012



On 11-05-12 12:19, Henning Rogge wrote:
> On 05/11/2012 11:49 AM, Ferry Huberts wrote:
>>
>>
>> On 11-05-12 11:40, Henning Rogge wrote:
>>> On 05/11/2012 09:36 AM, Ferry Huberts wrote:
>>>>
>>>>
>>>> On 11-05-12 08:01, Henning Rogge wrote:
>>>>> On 05/10/2012 10:04 PM, Ferry Huberts wrote:
>>>>>> On 10-05-12 21:47, Ferry Huberts wrote:
>>>>>>> From: Ferry Huberts<(spam-protected)>
>>>>>>>
>>>>>>> Signed-off-by: Ferry Huberts<(spam-protected)>
>>>>>>> ---
>>>>>>> make/Makefile.linux | 8 +++++++-
>>>>>>> 1 files changed, 7 insertions(+), 1 deletions(-)
>>>>>>>
>>>>>>> diff --git a/make/Makefile.linux b/make/Makefile.linux
>>>>>>> index e73be7c..fa729ba 100644
>>>>>>> --- a/make/Makefile.linux
>>>>>>> +++ b/make/Makefile.linux
>>>>>>> @@ -4,7 +4,13 @@
>>>>>>>
>>>>>>> ARCH := $(shell uname -m)
>>>>>>> DESTDIR ?=
>>>>>>> -LIBDIR = $(DESTDIR)/usr/lib
>>>>>>> +LIBDIR = $(DESTDIR)/usr/lib
>>>>>>> +ifeq ($(strip $(ARCH)),x86_64)
>>>>>>> + LIB64DIR := $(shell test -d "/usr/lib64"&& echo "YES")
>>>>>>> + ifeq ($(strip $(LIB64DIR)),YES)
>>>>>>> + LIBDIR = /usr/lib64
>>>>>>
>>>>>> damn, a typo here. must stop working now...
>>>>>> > + LIBDIR = $(DESTDIR)/usr/lib64
>>>>>
>>>>> and the shell test must be changed too... I wonder if its worth the
>>>>
>>>> You mean the 'no space before the &&'? That appears to have been
>>>> deleted
>>>> by accident by me, it's there in the original patch.
>>>
>>> $(shell test -d "/usr/lib64"&& echo "YES")
>>>
>>> should be
>>>
>>> $(shell test -d "$(DESTDIR)/usr/lib64"&& echo "YES")
>>>
>>> I think.
>>>
>>
>> don't think so.
>> I want to detect whether the system has a /usr/lib64.
>> Changing it to your version will never use lib64
>
> Why, DESTDIR should be / for normal systems.
>
> Your version will try to put everything into a /lib64 directory, even
> when crosscompiling. So it will most likely break OpenWRT.
>

my change will only use lib64 when the system on which the compilation 
is performed has a lib64

-- 
Ferry Huberts




More information about the Olsr-dev mailing list