[118550] trunk/dports/devel/codeblocks/files
mojca at macports.org
mojca at macports.org
Fri Apr 4 06:30:02 PDT 2014
Revision: 118550
https://trac.macports.org/changeset/118550
Author: mojca at macports.org
Date: 2014-04-04 06:30:02 -0700 (Fri, 04 Apr 2014)
Log Message:
-----------
codeblocks: don't patch automake files to avoid triggering autoconf tools
Modified Paths:
--------------
trunk/dports/devel/codeblocks/files/patch-Makefile.diff
trunk/dports/devel/codeblocks/files/patch-malloc.diff
trunk/dports/devel/codeblocks/files/patch-nodebug.diff
trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff
Modified: trunk/dports/devel/codeblocks/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-Makefile.diff 2014-04-04 13:27:03 UTC (rev 118549)
+++ trunk/dports/devel/codeblocks/files/patch-Makefile.diff 2014-04-04 13:30:02 UTC (rev 118550)
@@ -1,48 +1,48 @@
sent by afb
---- src/include/Makefile.am.orig
-+++ src/include/Makefile.am
-@@ -1,13 +1,14 @@
- SUBDIRS = scripting tinyxml
-
- if PRECOMPILE_HEADERS
--BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
-- $(top_builddir)/src/include/sdk_precomp.h.gch
-+BUILT_SOURCES = sdk.h.gch \
-+ sdk_precomp.h.gch
- else
- BUILT_SOURCES =
- endif
-
- AM_CPPFLAGS = $(WX_CXXFLAGS) \
-+ -I$(top_builddir)/src/include \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/include/tinyxml \
-@@ -176,16 +177,16 @@ ALLHEADERS = annoyingdialog.h \
-
- sdk_HEADERS = $(ALLHEADERS)
-
--$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
-- -rm -f $(top_builddir)/src/include/sdk.h.gch
-- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
-+sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
-+ -rm -f sdk.h.gch
-+ $(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
-
--$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
-- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-+sdk_precomp.h.gch: $(ALLHEADERS)
-+ -rm -f sdk_precomp.h.gch
-+ $(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-
- clean-local:
-- -rm -f $(top_builddir)/src/include/sdk.h.gch
-- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-+ -rm -f sdk.h.gch
-+ -rm -f sdk_precomp.h.gch
-
- EXTRA_DIST = autorevision.h
+#--- src/include/Makefile.am.orig
+#+++ src/include/Makefile.am
+#@@ -1,13 +1,14 @@
+# SUBDIRS = scripting tinyxml
+#
+# if PRECOMPILE_HEADERS
+#-BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
+#- $(top_builddir)/src/include/sdk_precomp.h.gch
+#+BUILT_SOURCES = sdk.h.gch \
+#+ sdk_precomp.h.gch
+# else
+# BUILT_SOURCES =
+# endif
+#
+# AM_CPPFLAGS = $(WX_CXXFLAGS) \
+#+ -I$(top_builddir)/src/include \
+# -I$(top_srcdir)/src/include \
+# -I$(top_srcdir)/src/sdk/wxscintilla/include \
+# -I$(top_srcdir)/src/include/tinyxml \
+#@@ -176,16 +177,16 @@ ALLHEADERS = annoyingdialog.h \
+#
+# sdk_HEADERS = $(ALLHEADERS)
+#
+#-$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
+#- -rm -f $(top_builddir)/src/include/sdk.h.gch
+#- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
+#+sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
+#+ -rm -f sdk.h.gch
+#+ $(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
+#
+#-$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
+#- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
+#- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
+#+sdk_precomp.h.gch: $(ALLHEADERS)
+#+ -rm -f sdk_precomp.h.gch
+#+ $(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
+#
+# clean-local:
+#- -rm -f $(top_builddir)/src/include/sdk.h.gch
+#- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
+#+ -rm -f sdk.h.gch
+#+ -rm -f sdk_precomp.h.gch
+#
+# EXTRA_DIST = autorevision.h
--- src/include/Makefile.in.orig
+++ src/include/Makefile.in
@@ -362,10 +362,11 @@ top_builddir = @top_builddir@
Modified: trunk/dports/devel/codeblocks/files/patch-malloc.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-malloc.diff 2014-04-04 13:27:03 UTC (rev 118549)
+++ trunk/dports/devel/codeblocks/files/patch-malloc.diff 2014-04-04 13:30:02 UTC (rev 118550)
@@ -10,14 +10,14 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
---- configure.ac.orig
-+++ configure.ac
-@@ -36,7 +36,7 @@ AC_PROG_LIBTOOL
- dnl Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
--AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h])
-+AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h])
-
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STDBOOL
+#--- configure.ac.orig
+#+++ configure.ac
+#@@ -36,7 +36,7 @@ AC_PROG_LIBTOOL
+# dnl Checks for header files.
+# AC_HEADER_DIRENT
+# AC_HEADER_STDC
+#-AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h])
+#+AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h])
+#
+# dnl Checks for typedefs, structures, and compiler characteristics.
+# AC_HEADER_STDBOOL
Modified: trunk/dports/devel/codeblocks/files/patch-nodebug.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-nodebug.diff 2014-04-04 13:27:03 UTC (rev 118549)
+++ trunk/dports/devel/codeblocks/files/patch-nodebug.diff 2014-04-04 13:30:02 UTC (rev 118550)
@@ -4,21 +4,21 @@
# * src/build_tools/autorevision/Makefile
# * src/sdk/Makefile
# * src/src/Makefile
---- acinclude.m4.orig
-+++ acinclude.m4
-@@ -69,12 +69,10 @@ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (defau
- if test "x$enable_debug" = "xyes"; then
- CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
- CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
-- LDFLAGS="-Wl,--no-undefined"
- AC_MSG_RESULT(yes)
- else
- CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
- CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-- LDFLAGS="-Wl,--no-undefined"
- AC_MSG_RESULT(no)
- fi
- ])
+#--- acinclude.m4.orig
+#+++ acinclude.m4
+#@@ -69,12 +69,10 @@ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (defau
+# if test "x$enable_debug" = "xyes"; then
+# CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
+# CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
+#- LDFLAGS="-Wl,--no-undefined"
+# AC_MSG_RESULT(yes)
+# else
+# CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
+# CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
+#- LDFLAGS="-Wl,--no-undefined"
+# AC_MSG_RESULT(no)
+# fi
+# ])
--- configure.orig
+++ configure
@@ -11932,13 +11932,11 @@ fi
Modified: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff 2014-04-04 13:27:03 UTC (rev 118549)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff 2014-04-04 13:30:02 UTC (rev 118550)
@@ -1,16 +1,16 @@
This is only needed for wxGTK-based installation
http://developer.berlios.de/bugs/?func=detailbug&bug_id=19116&group_id=5358
---- src/plugins/contrib/source_exporter/Makefile.am.orig
-+++ src/plugins/contrib/source_exporter/Makefile.am
-@@ -12,7 +12,7 @@ pluginlib_LTLIBRARIES = libexporter.la
-
- libexporter_la_CPPFLAGS = -DwxPDF_USE_WXMODULE=0
-
--libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
-+libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -lfontconfig
-
- libexporter_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la \
- wxPdfDocument/libwxPdfDocument.la
+#--- src/plugins/contrib/source_exporter/Makefile.am.orig
+#+++ src/plugins/contrib/source_exporter/Makefile.am
+#@@ -12,7 +12,7 @@ pluginlib_LTLIBRARIES = libexporter.la
+#
+# libexporter_la_CPPFLAGS = -DwxPDF_USE_WXMODULE=0
+#
+#-libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+#+libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -lfontconfig
+#
+# libexporter_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la \
+# wxPdfDocument/libwxPdfDocument.la
--- src/plugins/contrib/source_exporter/Makefile.in.orig
+++ src/plugins/contrib/source_exporter/Makefile.in
@@ -392,7 +392,7 @@ INCLUDES = $(WX_CXXFLAGS) \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140404/13e3fdf3/attachment.html>
More information about the macports-changes
mailing list