diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2013-04-03 18:49:44 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-04-04 17:46:46 +0000 |
commit | 368210926b67483a3926a0af1890127ca182e064 (patch) | |
tree | e3c0ee0602b096d099d49af789da2b284cbf0685 /solenv/bin | |
parent | 1d073a3b48d2d5387992a6868dcdd601b80838b7 (diff) |
remove -dylib_file mappings that are not needed anymore
XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries
without explicit mapping, but as baseline is now 10.6, this
wrapping is no longer necessary
Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8
Reviewed-on: https://gerrit.libreoffice.org/3192
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv/bin')
-rw-r--r-- | solenv/bin/macosx-dylib-link-list.pl | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl deleted file mode 100644 index 97458e431523..000000000000 --- a/solenv/bin/macosx-dylib-link-list.pl +++ /dev/null @@ -1,84 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -use lib ("$ENV{SOLARENV}/bin/modules"); -use macosxotoolhelper; - -sub locate($) -{ - my ($lib) = @_; - my $dir; - foreach $dir (@dirs) - { - my $path = "$dir/$lib"; - if (-e $path) - { - return $path; - } - } - return; -} - -sub handle($$) -{ - my ($from, $to) = @_; - # wrap -dylib_file in -Wl so that hopefully any used tool whatsoever (e.g., - # libtool generated from xmlsec1-1.2.6/configure included in - # libxmlsec/download/xmlsec1-1.2.6.tar.gz:1.3) passes it through to the - # linker: - !($from =~ /,/ || $to =~ /,/) or - die "$from:$to contains commas and cannot go into -Wl"; - print " -Wl,-dylib_file,$from:$to"; - $done{$from} = 1; - push(@todo, $to) if (grep {$_ eq $to} @todo) == 0; -} - -foreach (@ARGV) { push(@dirs, $1) if /^-L(.*)$/; } -foreach (@ARGV) -{ - if (/^-l(.*)$/) - { - my $loc = locate("lib$1.dylib"); - handle($1, $loc) if defined $loc && otoolD($loc) =~ m'^(@.+/.+)\n$'; - } -} -foreach $file (@todo) -{ - my $call = "otool -L $file"; - open(IN, "-|", $call) or die "cannot $call"; - while (<IN>) - { - if (m'^\s*(@.+/([^/]+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$') - { - my $full = $1; - my $loc = locate($2); - # mapping for PythonFramework in RepositoryExternal.mk - next if $full =~ m'^\s*@loader_path/(LibreOfficePython.framework/Versions/[^/]+/LibreOfficePython)'; - if (defined $loc) - { - handle($full, $loc) unless defined $done{$full}; - } - else - { - die "unknown $full (from $file)"; - } - } - } - close(IN); -} -print "\n"; |