Ken Takata avatar Ken Takata committed a8d212b

update for 7.3.823

* Remove a merged patch.
* Fix conflict.

Comments (0)

Files changed (3)

patch-direct_write.diff

 # HG changeset patch
-# Parent dac67253fa493ad0860e101d2044d557ccddc625
+# Parent 37ab25f9f0a93049fceb81d5ea41ddf40ffb50e6
 
 diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
 --- a/runtime/doc/eval.txt
  EXTRA_OBJS += $(OUTDIR)/if_ole.o
  EXTRA_LIBS += -loleaut32
 -ifeq (yes, $(STATIC_STDCPLUS))
--EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -lsupc++ -Wl,-Bdynamic
+-EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
 -else
 -EXTRA_LIBS += -lstdc++
 -endif

remove-supc++.patch

-# HG changeset patch
-# Parent 2876c01edbaddfd7db4df24b71057bfd2eba50f7
-diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
---- a/src/Make_cyg.mak
-+++ b/src/Make_cyg.mak
-@@ -487,7 +487,7 @@
- EXTRA_OBJS += $(OUTDIR)/if_ole.o
- EXTRA_LIBS += -loleaut32
- ifeq (yes, $(STATIC_STDCPLUS))
--EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -lsupc++ -Wl,-Bdynamic
-+EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
- else
- EXTRA_LIBS += -lstdc++
- endif
-remove-supc++.patch #+skip
 win32-suppress-warnings.patch
 symlinkfix-update.diff
 acl-fix.patch
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.