mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00
Code Issues Releases Activity

Dirty workaround for libtool

Browse Source 
Hint by: Bartosz Fabianowski <freebsd@chillt.de>
This commit is contained in:
Maho Nakata 2006-07-21 21:05:41 +00:00
parent 3a962d6f47
commit 7556ce58ae
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=168429
4 changed files with 146 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/gcc41-withgcjawt/Makefile
View File

@ -16,4 +16,12 @@ DESCR= ${.CURDIR}/pkg-descr
WITH_JAVA_AWT= yes
#weird libtool issue http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
EXTRA_PATCHES+= ${.CURDIR}/files/patch-configure
USE_AUTOTOOLS= libtool:15
pre-build:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${SRCDIR}/libjava/configure
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${SRCDIR}/libjava/classpath/configure
.include "${MASTERDIR}/Makefile"

65
lang/gcc41-withgcjawt/files/patch-configure Normal file
View File

@ -0,0 +1,65 @@
Real tweaks for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
never be upstreamed. correct solution might be upgrading libtool(?)
--- libjava/configure.orig Sat Jul 15 07:34:33 2006
+++ libjava/configure Fri Jul 21 16:37:48 2006
@@ -5867,6 +5867,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+cp %%LOCALBASE%%/bin/libtool .
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--- libjava/classpath/configure~ Wed Jun 14 22:46:33 2006
+++ libjava/classpath/configure Fri Jul 21 16:38:43 2006
@@ -5449,6 +5449,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+cp %%LOCALBASE%%/bin/libtool .
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--- ltconfig~ Wed Jul 5 05:30:34 2006
+++ ltconfig Fri Jul 21 19:59:52 2006
@@ -2236,7 +2236,7 @@
EOF
else
echo "appending configuration tag \"$tagname\" to $ofile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
cfgfile="$ofile"
;;
@@ -2266,7 +2266,7 @@
EOF
else
echo "appending to $cfgfile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
;;
esac
--- libjava/classpath/ltconfig~ Wed Jul 5 05:30:34 2006
+++ libjava/classpath/ltconfig Fri Jul 21 20:00:44 2006
@@ -2236,7 +2236,7 @@
EOF
else
echo "appending configuration tag \"$tagname\" to $ofile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
cfgfile="$ofile"
;;
@@ -2266,7 +2266,7 @@
EOF
else
echo "appending to $cfgfile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
;;
esac

8
lang/gcc42-withgcjawt/Makefile
View File

@ -16,4 +16,12 @@ DESCR= ${.CURDIR}/pkg-descr
WITH_JAVA_AWT= yes
#weird libtool issue http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
EXTRA_PATCHES+= ${.CURDIR}/files/patch-configure
USE_AUTOTOOLS= libtool:15
pre-build:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${SRCDIR}/libjava/configure
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${SRCDIR}/libjava/classpath/configure
.include "${MASTERDIR}/Makefile"

65
lang/gcc42-withgcjawt/files/patch-configure Normal file
View File

@ -0,0 +1,65 @@
Real tweaks for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
never be upstreamed. correct solution might be upgrading libtool(?)
--- libjava/configure.orig Sat Jul 15 07:34:33 2006
+++ libjava/configure Fri Jul 21 16:37:48 2006
@@ -5867,6 +5867,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+cp %%LOCALBASE%%/bin/libtool .
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--- libjava/classpath/configure~ Wed Jun 14 22:46:33 2006
+++ libjava/classpath/configure Fri Jul 21 16:38:43 2006
@@ -5449,6 +5449,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+cp %%LOCALBASE%%/bin/libtool .
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--- ltconfig~ Wed Jul 5 05:30:34 2006
+++ ltconfig Fri Jul 21 19:59:52 2006
@@ -2236,7 +2236,7 @@
EOF
else
echo "appending configuration tag \"$tagname\" to $ofile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
cfgfile="$ofile"
;;
@@ -2266,7 +2266,7 @@
EOF
else
echo "appending to $cfgfile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
;;
esac
--- libjava/classpath/ltconfig~ Wed Jul 5 05:30:34 2006
+++ libjava/classpath/ltconfig Fri Jul 21 20:00:44 2006
@@ -2236,7 +2236,7 @@
EOF
else
echo "appending configuration tag \"$tagname\" to $ofile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
cfgfile="$ofile"
;;
@@ -2266,7 +2266,7 @@
EOF
else
echo "appending to $cfgfile"
- echo "### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
+ echo "# ### BEGIN LIBTOOL TAG CONFIG: $tagname" >> "$ofile"
fi
;;
esac