aboutsummaryrefslogtreecommitdiff
path: root/devel/mingw-gcc
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2000-08-24 14:07:29 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2000-08-24 14:07:29 +0000
commite7a038828ec169ce824238c0197e5fe5482b0ec7 (patch)
treeb1b23150d895a9bac01fe3db11dfde5925f8fd0e /devel/mingw-gcc
parent45a3734328c2e9f8c3caa51caf0b89a5ff5fad7a (diff)
downloadports-e7a038828ec169ce824238c0197e5fe5482b0ec7.tar.gz
ports-e7a038828ec169ce824238c0197e5fe5482b0ec7.zip
Notes
Diffstat (limited to 'devel/mingw-gcc')
-rw-r--r--devel/mingw-gcc/Makefile26
-rw-r--r--devel/mingw-gcc/files/patch-aa29
-rw-r--r--devel/mingw-gcc/files/patch-ab53
-rw-r--r--devel/mingw-gcc/pkg-plist18
4 files changed, 101 insertions, 25 deletions
diff --git a/devel/mingw-gcc/Makefile b/devel/mingw-gcc/Makefile
index 2bdb1d6cc23c..b4659ce6d904 100644
--- a/devel/mingw-gcc/Makefile
+++ b/devel/mingw-gcc/Makefile
@@ -36,24 +36,20 @@ MAN1= cccp.1 \
i386-mingw32msvc-g77.1 \
i386-mingw32msvc-gcc.1
-post-configure:
- cd ${WRKSRC}/gcc; ${GMAKE} installdirs
-
post-install:
@for file in \
- c++ cpp g++ g77 gcc gcj gcjh gcov \
- jcf-dump jv-scan protoize unprotoize; \
+ cpp gcjh gcov jcf-dump jv-scan \
+ i386-mingw32msvc-c++ \
+ i386-mingw32msvc-c++filt \
+ i386-mingw32msvc-g++ \
+ i386-mingw32msvc-g77 \
+ i386-mingw32msvc-gcc \
+ i386-mingw32msvc-gcj \
+ i386-mingw32msvc-protoize \
+ i386-mingw32msvc-unprotoize; \
do \
- file1=${PREFIX}/bin/$${file}; \
- file2=${PREFIX}/bin/i386-mingw32msvc-$${file}; \
- if [ -f $${file1} ] && [ ! -f $${file2} ]; \
- then \
- ${CP} $${file1} $${file2}; \
- fi; \
- strip $${file2}; \
+ strip ${PREFIX}/bin/$${file}; \
done
-.for f in chill.info cpp.info g77.info gcc.info
- @install-info ${PREFIX}/info/${f} ${PREFIX}/info/dir
-.endfor
+ @rm ${PREFIX}/info/chill.info
.include <bsd.port.mk>
diff --git a/devel/mingw-gcc/files/patch-aa b/devel/mingw-gcc/files/patch-aa
new file mode 100644
index 000000000000..29cdf81e1bb9
--- /dev/null
+++ b/devel/mingw-gcc/files/patch-aa
@@ -0,0 +1,29 @@
+--- gcc/configure.orig Thu Aug 24 19:33:08 2000
++++ gcc/configure Thu Aug 24 19:52:57 2000
+@@ -763,7 +763,7 @@
+ gcc_gxx_include_dir='${libsubdir}/include/g++'
+ else
+ topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
+- gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
++ gcc_gxx_include_dir="\$(local_prefix)\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
+ fi
+ fi
+
+@@ -8530,7 +8530,7 @@
+ # make and thus we'd get different behavior depending on where we built the
+ # sources.
+ if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
+- gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
++ gcc_tooldir='$(local_prefix)/$(target_alias)'
+ else
+ # An explanation of the sed strings:
+ # -e 's|^\$(prefix)||' matches and eliminates 'prefix' from 'exec_prefix'
+@@ -8554,7 +8554,7 @@
+ # /foo /foo/bar/ugg ../../
+ #
+ dollar='$$'
+- gcc_tooldir="\$(libsubdir)/\$(unlibsubdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
++ gcc_tooldir="\$(libdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
+ fi
+
+
diff --git a/devel/mingw-gcc/files/patch-ab b/devel/mingw-gcc/files/patch-ab
new file mode 100644
index 000000000000..55c611144673
--- /dev/null
+++ b/devel/mingw-gcc/files/patch-ab
@@ -0,0 +1,53 @@
+--- gcc/Makefile.in.orig Thu Aug 24 19:46:43 2000
++++ gcc/Makefile.in Thu Aug 24 19:50:43 2000
+@@ -1407,12 +1407,12 @@
+ # Language-independent files.
+
+ DRIVER_DEFINES = \
+- -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
++ -DSTANDARD_STARTFILE_PREFIX=\"$(libdir)/\" \
+ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
+ -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+ -DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \
+ -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
+- -DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\"
++ -DTOOLDIR_BASE_PREFIX=\"$(local_prefix)/\"
+ gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
+ Makefile $(lang_specs_files) prefix.h
+ $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+@@ -1972,7 +1972,7 @@
+ $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+- -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+ -c `echo $(srcdir)/cccp.c | sed 's,^\./,,'`
+@@ -2006,7 +2006,7 @@
+ $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+- -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+ -c `echo $(srcdir)/cppinit.c | sed 's,^\./,,'`
+@@ -2031,7 +2031,7 @@
+ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+ -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+- -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ -DSTD_PROTO_DIR=\"$(libsubdir)\" \
+ $(srcdir)/protoize.c
+
+@@ -2042,7 +2042,7 @@
+ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+ -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+- -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ -DSTD_PROTO_DIR=\"$(libsubdir)\" \
+ $(srcdir)/unprotoize.c
+
diff --git a/devel/mingw-gcc/pkg-plist b/devel/mingw-gcc/pkg-plist
index d673d6382e56..9aa7a2ac5749 100644
--- a/devel/mingw-gcc/pkg-plist
+++ b/devel/mingw-gcc/pkg-plist
@@ -1,25 +1,24 @@
+bin/cpp
+bin/gcjh
+bin/gcov
bin/i386-mingw32msvc-c++
+bin/i386-mingw32msvc-c++filt
bin/i386-mingw32msvc-chill
-bin/i386-mingw32msvc-cpp
bin/i386-mingw32msvc-g++
bin/i386-mingw32msvc-g77
bin/i386-mingw32msvc-gcc
bin/i386-mingw32msvc-gcj
-bin/i386-mingw32msvc-gcjh
-bin/i386-mingw32msvc-gcov
-bin/i386-mingw32msvc-jcf-dump
-bin/i386-mingw32msvc-jv-scan
bin/i386-mingw32msvc-protoize
bin/i386-mingw32msvc-unprotoize
+bin/jcf-dump
+bin/jv-scan
i386-mingw32msvc/bin/gcc
i386-mingw32msvc/include/_G_config.h
i386-mingw32msvc/lib/libiberty.a
i386-mingw32msvc/lib/libstdc++.a.2.10.0
-@unexec install-info --delete %D/info/chill.info %D/info/dir
@unexec install-info --delete %D/info/cpp.info %D/info/dir
@unexec install-info --delete %D/info/g77.info %D/info/dir
@unexec install-info --delete %D/info/gcc.info %D/info/dir
-info/chill.info
info/cpp.info
info/cpp.info-1
info/cpp.info-2
@@ -77,7 +76,6 @@ info/gcc.info-6
info/gcc.info-7
info/gcc.info-8
info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
@exec install-info %D/info/cpp.info %D/info/dir
@exec install-info %D/info/g77.info %D/info/dir
@exec install-info %D/info/gcc.info %D/info/dir
@@ -294,5 +292,5 @@ lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libgcc.a
lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libobjc.a
lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libstdc++.a
lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/specs
-@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%
-@dirrm lib/gcc-lib/i386-mingw32msvc
+@unexec rmdir -p %D/lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%% 2>/dev/null || true
+lib/libiberty.a