mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
Remove this patch since perl patch in port Makefile is used to
accomplish this. PR: 37046 Submitted by: Helge Oldach <send-pr@oldach.net> Approved by: maintainer
This commit is contained in:
parent
55cac08b3d
commit
ff132cd6d8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=57698
@ -1,49 +0,0 @@
|
||||
--- srclib/apr/build/ltmain.sh.orig Sun Apr 7 23:04:28 2002
|
||||
+++ srclib/apr/build/ltmain.sh Sun Apr 7 23:05:33 2002
|
||||
@@ -1959,14 +1959,14 @@
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
- name="`expr $i : '-l\(.*\)'`"
|
||||
+ name="`expr -- $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
@@ -1984,7 +1984,7 @@
|
||||
# Error occured in the first compile. Let's try to salvage the situation:
|
||||
# Compile a seperate program for each library.
|
||||
for i in $deplibs; do
|
||||
- name="`expr $i : '-l\(.*\)'`"
|
||||
+ name="`expr -- $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
$rm conftest
|
||||
@@ -1996,7 +1996,7 @@
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
@@ -2022,9 +2022,9 @@
|
||||
;;
|
||||
file_magic*)
|
||||
set dummy $deplibs_check_method
|
||||
- file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
|
||||
+ file_magic_regex="`expr -- \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
|
||||
for a_deplib in $deplibs; do
|
||||
- name="`expr $a_deplib : '-l\(.*\)'`"
|
||||
+ name="`expr -- $a_deplib : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
@ -1,49 +0,0 @@
|
||||
--- srclib/apr/build/ltmain.sh.orig Sun Apr 7 23:04:28 2002
|
||||
+++ srclib/apr/build/ltmain.sh Sun Apr 7 23:05:33 2002
|
||||
@@ -1959,14 +1959,14 @@
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
- name="`expr $i : '-l\(.*\)'`"
|
||||
+ name="`expr -- $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
@@ -1984,7 +1984,7 @@
|
||||
# Error occured in the first compile. Let's try to salvage the situation:
|
||||
# Compile a seperate program for each library.
|
||||
for i in $deplibs; do
|
||||
- name="`expr $i : '-l\(.*\)'`"
|
||||
+ name="`expr -- $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
$rm conftest
|
||||
@@ -1996,7 +1996,7 @@
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
@@ -2022,9 +2022,9 @@
|
||||
;;
|
||||
file_magic*)
|
||||
set dummy $deplibs_check_method
|
||||
- file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
|
||||
+ file_magic_regex="`expr -- \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
|
||||
for a_deplib in $deplibs; do
|
||||
- name="`expr $a_deplib : '-l\(.*\)'`"
|
||||
+ name="`expr -- $a_deplib : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
@ -1,49 +0,0 @@
|
||||
--- srclib/apr/build/ltmain.sh.orig Sun Apr 7 23:04:28 2002
|
||||
+++ srclib/apr/build/ltmain.sh Sun Apr 7 23:05:33 2002
|
||||
@@ -1959,14 +1959,14 @@
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
- name="`expr $i : '-l\(.*\)'`"
|
||||
+ name="`expr -- $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
@@ -1984,7 +1984,7 @@
|
||||
# Error occured in the first compile. Let's try to salvage the situation:
|
||||
# Compile a seperate program for each library.
|
||||
for i in $deplibs; do
|
||||
- name="`expr $i : '-l\(.*\)'`"
|
||||
+ name="`expr -- $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
$rm conftest
|
||||
@@ -1996,7 +1996,7 @@
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
@@ -2022,9 +2022,9 @@
|
||||
;;
|
||||
file_magic*)
|
||||
set dummy $deplibs_check_method
|
||||
- file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
|
||||
+ file_magic_regex="`expr -- \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
|
||||
for a_deplib in $deplibs; do
|
||||
- name="`expr $a_deplib : '-l\(.*\)'`"
|
||||
+ name="`expr -- $a_deplib : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
@ -1,49 +0,0 @@
|
||||
--- srclib/apr/build/ltmain.sh.orig Sun Apr 7 23:04:28 2002
|
||||
+++ srclib/apr/build/ltmain.sh Sun Apr 7 23:05:33 2002
|
||||
@@ -1959,14 +1959,14 @@
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
- name="`expr $i : '-l\(.*\)'`"
|
||||
+ name="`expr -- $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
@@ -1984,7 +1984,7 @@
|
||||
# Error occured in the first compile. Let's try to salvage the situation:
|
||||
# Compile a seperate program for each library.
|
||||
for i in $deplibs; do
|
||||
- name="`expr $i : '-l\(.*\)'`"
|
||||
+ name="`expr -- $i : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
$rm conftest
|
||||
@@ -1996,7 +1996,7 @@
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
set dummy $deplib_matches
|
||||
deplib_match=$2
|
||||
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
+ if test `expr -- "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
|
||||
newdeplibs="$newdeplibs $i"
|
||||
else
|
||||
droppeddeps=yes
|
||||
@@ -2022,9 +2022,9 @@
|
||||
;;
|
||||
file_magic*)
|
||||
set dummy $deplibs_check_method
|
||||
- file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
|
||||
+ file_magic_regex="`expr -- \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
|
||||
for a_deplib in $deplibs; do
|
||||
- name="`expr $a_deplib : '-l\(.*\)'`"
|
||||
+ name="`expr -- $a_deplib : '-l\(.*\)'`"
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" ; then
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
Loading…
Reference in New Issue
Block a user