kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/rlvm: flatten gcc48 workaround

Browse source
This commit is contained in:
Jan Beich 2016-10-01 06:32:14 +00:00
parent 80450e4895
commit f2ef7e05ca
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=423035
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devel/rlvm/Makefile
View file

@ -35,10 +35,6 @@ MAKE_ARGS= VERBOSE=1
INSTALLS_ICONS= yes
PORTDOCS= AUTHORS.TXT NEWS.TXT README.md STATUS.TXT notes
# XXX 9.x EOL to phase out USES=compiler, unblocking lang/gcc update
EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${CHOSEN_COMPILER_TYPE}}
EXTRA_PATCHES_FreeBSD_gcc= ${PATCHDIR}/extra-patch-gcc48
OPTIONS_DEFINE= DEBUG DOCS NLS TEST
OPTIONS_DEFAULT=MONA
OPTIONS_MULTI= JAPANESE_FONT

11
devel/rlvm/files/extra-patch-gcc48 → devel/rlvm/files/patch-src_base_notification__registrar.cc
View file

@ -1,16 +1,17 @@
https://github.com/eglaysher/rlvm/issues/80
diff --git src/base/notification_registrar.cc src/base/notification_registrar.cc
index 2b9d99d..2a6f63f 100644
--- src/base/notification_registrar.cc
--- src/base/notification_registrar.cc.orig 2016-07-30 22:27:57 UTC
+++ src/base/notification_registrar.cc
@@ -46,7 +46,8 @@
@@ -46,7 +46,12 @@ void NotificationRegistrar::Remove(Notif
}
Record record = { observer, type, source };
- auto found = std::find(registered_.cbegin(), registered_.cend(), record);
+#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5
+ RecordVector::iterator found = std::find(
+ registered_.begin(), registered_.end(), record);
+#else
auto found = std::find(registered_.cbegin(), registered_.cend(), record);
+#endif
registered_.erase(found);
// This can be NULL if our owner outlives the NotificationService, e.g. if our