Franco Fichtner
parent
bed23c4aec
commit
97012f3566
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1683710874
|
||||
SHA256 (KDE/frameworks/5.106.0/karchive-5.106.0.tar.xz) = fc1e5a8e94bb000ba30a5e7ba975126363c97acec98112ab58aaec1069d5a596
|
||||
SIZE (KDE/frameworks/5.106.0/karchive-5.106.0.tar.xz) = 1016472
|
||||
TIMESTAMP = 1686028447
|
||||
SHA256 (KDE/frameworks/5.107.0/karchive-5.107.0.tar.xz) = e88cb94b9af8a88f360e627b3ae7a2b99ccdfe3fe9e1961452056b2a00f04a7f
|
||||
SIZE (KDE/frameworks/5.107.0/karchive-5.107.0.tar.xz) = 1017740
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ share/locale/es/LC_MESSAGES/karchive5_qt.qm
|
|||
share/locale/fi/LC_MESSAGES/karchive5_qt.qm
|
||||
share/locale/fr/LC_MESSAGES/karchive5_qt.qm
|
||||
share/locale/ia/LC_MESSAGES/karchive5_qt.qm
|
||||
share/locale/id/LC_MESSAGES/karchive5_qt.qm
|
||||
share/locale/it/LC_MESSAGES/karchive5_qt.qm
|
||||
share/locale/ja/LC_MESSAGES/karchive5_qt.qm
|
||||
share/locale/ka/LC_MESSAGES/karchive5_qt.qm
|
||||
|
|
|
|||
|
|
@ -213,12 +213,10 @@
|
|||
SUBDIR += funktrackergold
|
||||
SUBDIR += furnace
|
||||
SUBDIR += ganv
|
||||
SUBDIR += gbemol
|
||||
SUBDIR += gbsplay
|
||||
SUBDIR += geonkick-lv2
|
||||
SUBDIR += ggwave
|
||||
SUBDIR += giada
|
||||
SUBDIR += glurp
|
||||
SUBDIR += gmsynth-lv2
|
||||
SUBDIR += gmtp
|
||||
SUBDIR += gmusicbrowser
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= fasttracker2
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.67
|
||||
DISTVERSION= 1.68
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= ehaupt@FreeBSD.org
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1682575507
|
||||
SHA256 (8bitbubsy-ft2-clone-v1.67_GH0.tar.gz) = 9732cbe813a0ae2469af8cff56c63c3c0ab8ba543f226b9fe9277f522b87b3c4
|
||||
SIZE (8bitbubsy-ft2-clone-v1.67_GH0.tar.gz) = 6015726
|
||||
TIMESTAMP = 1688073582
|
||||
SHA256 (8bitbubsy-ft2-clone-v1.68_GH0.tar.gz) = 66933595b5b7dfdda47b5f449e59bcda4a3ee5f164141d055c7ab3f8d0f218a0
|
||||
SIZE (8bitbubsy-ft2-clone-v1.68_GH0.tar.gz) = 6025918
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
PORTNAME= gbemol
|
||||
PORTVERSION= 0.3.2
|
||||
PORTREVISION= 16
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= SF
|
||||
|
||||
MAINTAINER= tmh.public@gmail.com
|
||||
COMMENT= Graphical frontend for the Music Player Daemon
|
||||
WWW= http://gbemol.sourceforge.net/
|
||||
|
||||
DEPRECATED= Unmaintained for years and depends on deprecated GTK2
|
||||
EXPIRATION_DATE=2023-06-30
|
||||
|
||||
LIB_DEPENDS= libmpd.so:audio/libmpd \
|
||||
libcurl.so:ftp/curl \
|
||||
libxml2.so:textproc/libxml2
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CPPFLAGS+= -I${LOCALBASE}/include
|
||||
LIBS+= -L${LOCALBASE}/lib
|
||||
USES= gettext gmake gnome pkgconfig
|
||||
USE_GNOME= gtk20 intltool
|
||||
|
||||
post-patch:
|
||||
@${CHMOD} a+x ${WRKSRC}/install-sh
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
SHA256 (gbemol-0.3.2.tar.gz) = dda7658d91ab12a1a94703321aae0bb525c887b83fbd4f4dcfa446c083785a50
|
||||
SIZE (gbemol-0.3.2.tar.gz) = 401865
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
gbemol is a graphical frontend for the Music Player Daemon (MPD) it is
|
||||
written in C and uses the GTK+ toolkit for it's interface.
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
bin/gbemol
|
||||
share/pixmaps/gbemol.png
|
||||
share/applications/gbemol.desktop
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
PORTNAME= glurp
|
||||
PORTVERSION= 0.12.3
|
||||
PORTREVISION= 7
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= SF
|
||||
|
||||
MAINTAINER= ports@mark.reidel.info
|
||||
COMMENT= Nice and clean GTK+-2.x based graphical client for musicpd
|
||||
WWW= https://sourceforge.net/projects/glurp/
|
||||
|
||||
LICENSE= GPLv2+
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
DEPRECATED= Unmaintained for years and depends on deprecated GTK2
|
||||
EXPIRATION_DATE=2023-06-30
|
||||
|
||||
LIB_DEPENDS= libmpd.so:audio/libmpd
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USES= gmake gnome pkgconfig
|
||||
USE_GNOME= gtk20 glib20 libglade2
|
||||
MAKE_ARGS+= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib -export-dynamic" \
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
SHA256 (glurp-0.12.3.tar.gz) = c145a58008c642ddb48db9ff9e68f1869b9d7e3a91b95885c587bb3c2085461e
|
||||
SIZE (glurp-0.12.3.tar.gz) = 166976
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
A GTK2 based graphical client with simple and clean interface.
|
||||
|
||||
Features
|
||||
* Support for loading/saving playlists
|
||||
* File Browser
|
||||
* Playlist Quicksearch
|
||||
* Supports streams in MPD (MPD 0.11.0 and higher)
|
||||
* ID3 Information
|
||||
* Single window interface, with possibility to hide the playlist
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
bin/glurp
|
||||
%%DATADIR%%/glurp.glade
|
||||
%%DATADIR%%/pixmaps/add.png
|
||||
%%DATADIR%%/pixmaps/condense.png
|
||||
%%DATADIR%%/pixmaps/config.png
|
||||
%%DATADIR%%/pixmaps/media-audiofile.png
|
||||
%%DATADIR%%/pixmaps/offline.png
|
||||
%%DATADIR%%/pixmaps/online.png
|
||||
%%DATADIR%%/pixmaps/outputs.png
|
||||
%%DATADIR%%/pixmaps/player-next.png
|
||||
%%DATADIR%%/pixmaps/player-pause.png
|
||||
%%DATADIR%%/pixmaps/player-play.png
|
||||
%%DATADIR%%/pixmaps/player-prev.png
|
||||
%%DATADIR%%/pixmaps/player-random.png
|
||||
%%DATADIR%%/pixmaps/player-repeat.png
|
||||
%%DATADIR%%/pixmaps/player-stop.png
|
||||
%%DATADIR%%/pixmaps/player-tabswitch.png
|
||||
%%DATADIR%%/pixmaps/playlist.png
|
||||
%%DATADIR%%/pixmaps/playlists.png
|
||||
%%DATADIR%%/pixmaps/remove.png
|
||||
|
|
@ -15,7 +15,6 @@
|
|||
SUBDIR += arrow
|
||||
SUBDIR += arrow-glib
|
||||
SUBDIR += ateam_mysql57_ldap_auth
|
||||
SUBDIR += ateam_mysql_ldap_auth
|
||||
SUBDIR += autobackupmysql
|
||||
SUBDIR += automysqlbackup
|
||||
SUBDIR += bbdb
|
||||
|
|
@ -178,8 +177,6 @@
|
|||
SUBDIR += mariadb-connector-odbc
|
||||
SUBDIR += mariadb1011-client
|
||||
SUBDIR += mariadb1011-server
|
||||
SUBDIR += mariadb104-client
|
||||
SUBDIR += mariadb104-server
|
||||
SUBDIR += mariadb105-client
|
||||
SUBDIR += mariadb105-server
|
||||
SUBDIR += mariadb106-client
|
||||
|
|
@ -190,8 +187,6 @@
|
|||
SUBDIR += memcached
|
||||
SUBDIR += metabase
|
||||
SUBDIR += mongodb-tools
|
||||
SUBDIR += mongodb40
|
||||
SUBDIR += mongodb40-tools
|
||||
SUBDIR += mongodb42
|
||||
SUBDIR += mongodb42-tools
|
||||
SUBDIR += mongodb44
|
||||
|
|
@ -202,29 +197,23 @@
|
|||
SUBDIR += mroonga
|
||||
SUBDIR += mtop
|
||||
SUBDIR += mydumper
|
||||
SUBDIR += mysac
|
||||
SUBDIR += mysql++
|
||||
SUBDIR += mysql-connector-c++
|
||||
SUBDIR += mysql-connector-java
|
||||
SUBDIR += mysql-connector-java51
|
||||
SUBDIR += mysql-connector-odbc-80
|
||||
SUBDIR += mysql-q4m
|
||||
SUBDIR += mysql-udf
|
||||
SUBDIR += mysql2pgsql
|
||||
SUBDIR += mysql56-client
|
||||
SUBDIR += mysql56-server
|
||||
SUBDIR += mysql57-client
|
||||
SUBDIR += mysql57-server
|
||||
SUBDIR += mysql80-client
|
||||
SUBDIR += mysql80-server
|
||||
SUBDIR += mysqlbackup
|
||||
SUBDIR += mysqlbigram
|
||||
SUBDIR += mysqldump-secure
|
||||
SUBDIR += mysqlreport
|
||||
SUBDIR += mysqlsla
|
||||
SUBDIR += mysqltcl
|
||||
SUBDIR += mysqltuner
|
||||
SUBDIR += mysqlwsrep56-server
|
||||
SUBDIR += mysqlwsrep57-server
|
||||
SUBDIR += mytop
|
||||
SUBDIR += nagios-check_mongodb
|
||||
|
|
@ -758,7 +747,6 @@
|
|||
SUBDIR += py-berkeleydb
|
||||
SUBDIR += py-carbon
|
||||
SUBDIR += py-cassandra-driver
|
||||
SUBDIR += py-caterva
|
||||
SUBDIR += py-couchdb
|
||||
SUBDIR += py-databases
|
||||
SUBDIR += py-dbf
|
||||
|
|
|
|||
|
|
@ -22,4 +22,12 @@ RUN_DEPENDS= ${CRAN_DEPENDS}
|
|||
|
||||
USES= cran:auto-plist,compiles
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
post-patch:
|
||||
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
|
||||
@${REINPLACE_CMD} -e 's|PKG_CPPFLAGS=|PKG_CPPFLAGS=-Wno-error=enum-constexpr-conversion |g' \
|
||||
${WRKSRC}/src/Makevars
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ WWW= https://github.com/ateamsystems/ateam_mysql_ldap_auth
|
|||
LICENSE= GPLv2
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
IGNORE_WITH_MYSQL= 56 80 101m 102m 103m
|
||||
IGNORE_WITH_MYSQL= 80
|
||||
|
||||
LIB_DEPENDS= libconfig.so:devel/libconfig
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
PORTNAME= ateam_mysql_ldap_auth
|
||||
PORTVERSION= 1.0
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= databases
|
||||
|
||||
MAINTAINER= ganbold@FreeBSD.org
|
||||
COMMENT= A-Team MySQL LDAP authentication plugin
|
||||
WWW= https://github.com/ateamsystems/ateam_mysql_ldap_auth
|
||||
|
||||
LICENSE= GPLv2
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
DEPRECATED= Requires upstream EOL MySQL 5.6
|
||||
EXPIRATION_DATE= 2023-06-30
|
||||
|
||||
LIB_DEPENDS= libconfig.so:devel/libconfig
|
||||
|
||||
USES= gmake ldap mysql:client,server
|
||||
|
||||
IGNORE_WITH_MYSQL= 57 80 101m 102m 103m 57p 57w
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= ateamsystems
|
||||
GH_TAGNAME= f6a1a5d
|
||||
|
||||
PLIST_FILES= lib/mysql/plugin/auth_ldap.so \
|
||||
"@sample etc/ateam_mysql_ldap_auth.conf.sample"
|
||||
PORTDOCS= README INSTALL
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
SUB_FILES= pkg-message
|
||||
|
||||
do-install:
|
||||
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mysql/plugin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/src/auth_ldap.so \
|
||||
${STAGEDIR}${PREFIX}/lib/mysql/plugin
|
||||
${INSTALL_DATA} ${WRKSRC}/ateam_mysql_ldap_auth.conf \
|
||||
${STAGEDIR}${PREFIX}/etc/ateam_mysql_ldap_auth.conf.sample
|
||||
|
||||
do-install-DOCS-on:
|
||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
SHA256 (ateamsystems-ateam_mysql_ldap_auth-1.0-f6a1a5d_GH0.tar.gz) = 3a20533fb4fed93daad0e8944ab6e8ae530ecbebefd95240b1e60f3c5ca5ec9c
|
||||
SIZE (ateamsystems-ateam_mysql_ldap_auth-1.0-f6a1a5d_GH0.tar.gz) = 17971
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
[
|
||||
{ type: install
|
||||
message: <<EOM
|
||||
Please see %%DOCSDIR%%/INSTALL
|
||||
for install notes.
|
||||
EOM
|
||||
}
|
||||
]
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
A-Team MySQL LDAP Authenticator (ateam_mysql_ldap_auth) is an authentication
|
||||
plugin for MySQL 5.5.7 and up, and has been tested with 5.6 under FreeBSD.
|
||||
This module allows you to create MySQL users that are then authenticated
|
||||
against an LDAP server. This reduces administrative overhead and eliminates
|
||||
your users having to remember a seperate username and password for MySQL.
|
||||
Just like MySQL Enterprise's PAM module, for client side authentication
|
||||
this plugin uses the clear_text password module as the LDAP server must
|
||||
perform the password hasing and comparison. For command line clients this
|
||||
is done by setting the following environment variable:
|
||||
|
||||
export LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN=1
|
||||
|
||||
In MySQL Workbench this is acheived by going to go to the "Advanced" tab and
|
||||
checking "Enable Cleartext Authentication Plugin" when editing a connction.
|
||||
|
||||
!!! IMPORTANT:
|
||||
!!! ------------------------------------------------------------------------
|
||||
!!! ENSURE THE COMMUNICATIONS PATH BETWEEN THE CLIENT AND SERVER IS SECURE!
|
||||
!!! ------------------------------------------------------------------------
|
||||
!!! By default MySQL does not use SSL so additional steps and network design
|
||||
!!! are needed to ensure you're not exposing your credetials.
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
PORTNAME= mariadb
|
||||
PKGNAMESUFFIX= 104-client
|
||||
|
||||
COMMENT= Multithreaded SQL database (client)
|
||||
|
||||
MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
|
||||
|
||||
PLIST= ${.CURDIR}/pkg-plist
|
||||
|
||||
CONFLICTS_INSTALL= databases/mytop
|
||||
|
||||
.include "${MASTERDIR}/Makefile"
|
||||
|
|
@ -1,173 +0,0 @@
|
|||
bin/mariadb
|
||||
bin/mariadb-access
|
||||
bin/mariadb-admin
|
||||
bin/mariadb-binlog
|
||||
bin/mariadb-check
|
||||
bin/mariadb-convert-table-format
|
||||
bin/mariadb-dump
|
||||
bin/mariadb-find-rows
|
||||
bin/mariadb-hotcopy
|
||||
bin/mariadb-import
|
||||
bin/mariadb-plugin
|
||||
bin/mariadb-setpermission
|
||||
bin/mariadb-show
|
||||
bin/mariadb-slap
|
||||
@comment bin/mariadb-test
|
||||
@comment bin/mariadb-waitpid
|
||||
bin/mariadb_config
|
||||
bin/msql2mysql
|
||||
bin/mysql
|
||||
bin/mysql_config
|
||||
bin/mysql_convert_table_format
|
||||
bin/mysql_find_rows
|
||||
bin/mysql_setpermission
|
||||
@comment bin/mysql_plugin
|
||||
@comment bin/mysql_waitpid
|
||||
bin/mysqlaccess
|
||||
bin/mysqladmin
|
||||
bin/mysqlbinlog
|
||||
bin/mysqlcheck
|
||||
bin/mysqldump
|
||||
bin/mysqlhotcopy
|
||||
bin/mysqlimport
|
||||
bin/mysqlshow
|
||||
bin/mysqlslap
|
||||
@comment bin/mysqltest
|
||||
bin/mytop
|
||||
bin/replace
|
||||
@comment bin/wsrep_sst_rsync_wan
|
||||
@sample %%ETCDIR%%/my.cnf.sample
|
||||
@sample %%ETCDIR%%/conf.d/client.cnf.sample
|
||||
include/mysql/errmsg.h
|
||||
include/mysql/ma_list.h
|
||||
include/mysql/ma_pvio.h
|
||||
include/mysql/ma_tls.h
|
||||
include/mysql/mariadb/ma_io.h
|
||||
include/mysql/mariadb_com.h
|
||||
include/mysql/mariadb_ctype.h
|
||||
include/mysql/mariadb_dyncol.h
|
||||
include/mysql/mariadb_rpl.h
|
||||
include/mysql/mariadb_stmt.h
|
||||
include/mysql/mariadb_version.h
|
||||
include/mysql/my_config.h
|
||||
include/mysql/my_global.h
|
||||
include/mysql/my_sys.h
|
||||
include/mysql/mysql.h
|
||||
include/mysql/mysql_com.h
|
||||
include/mysql/mysql_version.h
|
||||
include/mysql/mysql/client_plugin.h
|
||||
include/mysql/mysql/plugin_auth.h
|
||||
include/mysql/mysql/plugin_auth_common.h
|
||||
include/mysql/mysqld_error.h
|
||||
%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
|
||||
lib/mysql/libmariadb.a
|
||||
lib/mysql/libmariadb.so
|
||||
lib/mysql/libmariadb.so.3
|
||||
lib/mysql/libmariadbclient.a
|
||||
lib/mysql/libmysqlclient.a
|
||||
lib/mysql/libmysqlclient.so
|
||||
lib/mysql/libmysqlclient_r.a
|
||||
lib/mysql/libmysqlclient_r.so
|
||||
@comment lib/mysql/plugin/caching_sha2_password.so
|
||||
lib/mysql/plugin/client_ed25519.so
|
||||
lib/mysql/plugin/daemon_example.ini
|
||||
lib/mysql/plugin/dialog.so
|
||||
lib/mysql/plugin/mysql_clear_password.so
|
||||
lib/mysql/plugin/sha256_password.so
|
||||
libdata/pkgconfig/libmariadb.pc
|
||||
@comment share/man/man1/aria_chk.1.gz
|
||||
@comment share/man/man1/aria_dump_log.1.gz
|
||||
@comment share/man/man1/aria_ftdump.1.gz
|
||||
@comment share/man/man1/aria_pack.1.gz
|
||||
@comment share/man/man1/aria_read_log.1.gz
|
||||
@comment share/man/man1/galera_new_cluster.1.gz
|
||||
@comment share/man/man1/galera_recovery.1.gz
|
||||
@comment share/man/man1/innochecksum.1.gz
|
||||
@comment share/man/man1/mariabackup.1.gz
|
||||
share/man/man1/mariadb.1.gz
|
||||
share/man/man1/mariadb-access.1.gz
|
||||
share/man/man1/mariadb-admin.1.gz
|
||||
@comment share/man/man1/mariadb-backup.1.gz
|
||||
share/man/man1/mariadb-binlog.1.gz
|
||||
share/man/man1/mariadb-check.1.gz
|
||||
@comment share/man/man1/mariadb-client-test-embedded.1.gz
|
||||
@comment share/man/man1/mariadb-client-test.1.gz
|
||||
share/man/man1/mariadb-convert-table-format.1.gz
|
||||
share/man/man1/mariadb-dump.1.gz
|
||||
@comment share/man/man1/mariadb-dumpslow.1.gz
|
||||
@comment share/man/man1/mariadb-embedded.1.gz
|
||||
share/man/man1/mariadb-find-rows.1.gz
|
||||
@comment share/man/man1/mariadb-fix-extensions.1.gz
|
||||
share/man/man1/mariadb-hotcopy.1.gz
|
||||
share/man/man1/mariadb-import.1.gz
|
||||
@comment share/man/man1/mariadb-install-db.1.gz
|
||||
@comment share/man/man1/mariadb-ldb.1.gz
|
||||
share/man/man1/mariadb-plugin.1.gz
|
||||
@comment share/man/man1/mariadb-secure-installation.1.gz
|
||||
@comment share/man/man1/mariadb-service-convert.1.gz
|
||||
share/man/man1/mariadb-setpermission.1.gz
|
||||
share/man/man1/mariadb-show.1.gz
|
||||
share/man/man1/mariadb-slap.1.gz
|
||||
@comment share/man/man1/mariadb-test-embedded.1.gz
|
||||
@comment share/man/man1/mariadb-test.1.gz
|
||||
@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
|
||||
@comment share/man/man1/mariadb-upgrade.1.gz
|
||||
@comment share/man/man1/mariadb-waitpid.1.gz
|
||||
@comment share/man/man1/mariadbd-multi.1.gz
|
||||
@comment share/man/man1/mariadbd-safe-helper.1.gz
|
||||
@comment share/man/man1/mariadbd-safe.1.gz
|
||||
@comment share/man/man8/mariadbd.8.gz
|
||||
share/man/man1/msql2mysql.1.gz
|
||||
@comment share/man/man1/mbstream.1.gz
|
||||
@comment share/man/man1/my_print_defaults.1.gz
|
||||
share/man/man1/my_safe_process.1.gz
|
||||
@comment share/man/man1/myisam_ftdump.1.gz
|
||||
@comment share/man/man1/myisamchk.1.gz
|
||||
@comment share/man/man1/myisamlog.1.gz
|
||||
@comment share/man/man1/myisampack.1.gz
|
||||
share/man/man1/mysql-stress-test.pl.1.gz
|
||||
share/man/man1/mysql-test-run.pl.1.gz
|
||||
share/man/man1/mysql.1.gz
|
||||
@comment share/man/man1/mysql.server.1.gz
|
||||
@comment share/man/man1/mysql_client_test.1.gz
|
||||
@comment share/man/man1/mysql_client_test_embedded.1.gz
|
||||
share/man/man1/mysql_config.1.gz
|
||||
share/man/man1/mysql_convert_table_format.1.gz
|
||||
@comment share/man/man1/mysql_embedded.1.gz
|
||||
share/man/man1/mysql_find_rows.1.gz
|
||||
@comment share/man/man1/mysql_fix_extensions.1.gz
|
||||
@comment share/man/man1/mysql_install_db.1.gz
|
||||
@comment share/man/man1/mysql_ldb.1.gz
|
||||
share/man/man1/mysql_plugin.1.gz
|
||||
@comment share/man/man1/mysql_secure_installation.1.gz
|
||||
share/man/man1/mysql_setpermission.1.gz
|
||||
@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
|
||||
@comment share/man/man1/mysql_upgrade.1.gz
|
||||
share/man/man1/mysql_waitpid.1.gz
|
||||
share/man/man1/mysqlaccess.1.gz
|
||||
share/man/man1/mysqladmin.1.gz
|
||||
share/man/man1/mysqlbinlog.1.gz
|
||||
share/man/man1/mysqlcheck.1.gz
|
||||
@comment share/man/man1/mysqld_multi.1.gz
|
||||
@comment share/man/man1/mysqld_safe.1.gz
|
||||
@comment share/man/man1/mysqld_safe_helper.1.gz
|
||||
share/man/man1/mysqldump.1.gz
|
||||
@comment share/man/man1/mysqldumpslow.1.gz
|
||||
share/man/man1/mysqlhotcopy.1.gz
|
||||
share/man/man1/mysqlimport.1.gz
|
||||
share/man/man1/mysqlshow.1.gz
|
||||
share/man/man1/mysqlslap.1.gz
|
||||
@comment share/man/man1/mysqltest.1.gz
|
||||
@comment share/man/man1/mysqltest_embedded.1.gz
|
||||
@comment share/man/man1/perror.1.gz
|
||||
share/man/man1/replace.1.gz
|
||||
@comment share/man/man1/resolve_stack_dump.1.gz
|
||||
@comment share/man/man1/resolveip.1.gz
|
||||
@comment share/man/man1/wsrep_sst_common.1.gz
|
||||
@comment share/man/man1/wsrep_sst_mariabackup.1.gz
|
||||
@comment share/man/man1/wsrep_sst_mysqldump.1.gz
|
||||
@comment share/man/man1/wsrep_sst_rsync.1.gz
|
||||
@comment share/man/man1/wsrep_sst_rsync_wan.1.gz
|
||||
@comment share/man/man8/mysqld.8.gz
|
||||
libdata/pkgconfig/mariadb.pc
|
||||
@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_RUNDIR%%
|
||||
|
|
@ -1,270 +0,0 @@
|
|||
PORTNAME?= mariadb
|
||||
PORTVERSION= 10.4.29
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \
|
||||
https://mirror.one.com/${SITESDIR}/ \
|
||||
https://ftp.nluug.nl/db/${SITESDIR}/ \
|
||||
https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \
|
||||
https://mirror.truenetwork.ru/${SITESDIR}/ \
|
||||
https://mirrors.aliyun.com/${SITESDIR}/ \
|
||||
https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \
|
||||
https://mirror.kku.ac.th/${SITESDIR}/ \
|
||||
https://espejito.fder.edu.uy/${SITESDIR}/ \
|
||||
https://mirror1.cl.netactuate.com/${SITESDIR}/ \
|
||||
https://ftp.osuosl.org/pub/${SITESDIR}/ \
|
||||
https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/
|
||||
PKGNAMESUFFIX?= 104-server
|
||||
|
||||
MAINTAINER= brnrd@FreeBSD.org
|
||||
COMMENT?= Multithreaded SQL database (server)
|
||||
WWW= https://mariadb.org/
|
||||
|
||||
DEPRECATED= Use databases/mariadb106-server
|
||||
EXPIRATION_DATE= 2023-06-30
|
||||
|
||||
LICENSE= GPLv2
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
|
||||
IGNORE_SSL= openssl30 openssl31
|
||||
IGNORE_SSL_REASON= Upstream only supports OpenSSL 1.0.1 upto 1.1.X
|
||||
|
||||
SUB_FILES= pkg-message
|
||||
PKGMESSAGE= ${WRKDIR}/pkg-message
|
||||
|
||||
USE_LDCONFIG= ${PREFIX}/lib/mysql
|
||||
SHEBANG_FILES= scripts/*.sh
|
||||
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
|
||||
|
||||
DOCSDIR= ${PREFIX}/share/doc/mysql
|
||||
ETCDIR= ${PREFIX}/etc/mysql
|
||||
|
||||
MARIADB_USER?= mysql
|
||||
MARIADB_GROUP?= mysql
|
||||
|
||||
MARIADB_RUNDIR?= /var/run/mysql
|
||||
MARIADB_SOCK?= mysql.sock
|
||||
MARIADB_LOGDIR?= /var/log/mysql
|
||||
|
||||
OPTIONS_SINGLE= GSSAPI
|
||||
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
|
||||
OPTIONS_DEFAULT= GSSAPI_BASE
|
||||
|
||||
.if ${PKGNAMESUFFIX:M*-server}
|
||||
# MySQL-Server options
|
||||
OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
|
||||
OPTIONS_GROUP= COMPRESSION ENGINES GROONGA
|
||||
OPTIONS_DEFINE= CONNECT_EXTRA DOCS
|
||||
OPTIONS_DEFINE_amd64= WSREP
|
||||
OPTIONS_DEFINE_powerpc64le= WSREP
|
||||
OPTIONS_DEFINE_powerpc64= WSREP
|
||||
OPTIONS_DEFINE_riscv64= WSREP
|
||||
OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD
|
||||
OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB
|
||||
OPTIONS_GROUP_GROONGA= ZMQ MSGPACK
|
||||
OPTIONS_EXCLUDE_i386= ROCKSDB TOKUDB
|
||||
|
||||
CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine
|
||||
COMPRESSION_DESC= Optional page compression
|
||||
ENGINES_DESC= Optional MariaDB storage engines
|
||||
GROONGA_DESC= Optional Mroonga features
|
||||
INNOBASE_DESC= InnoDB default engine
|
||||
MROONGA_DESC= Mroonga Full Text Search engine
|
||||
MSGPACK_DESC= MsgPack support
|
||||
OQGRAPH_DESC= Open Query Graph Computation engine
|
||||
ROCKSDB_DESC= RocksDB LSM engine (Alpha)
|
||||
SPHINX_DESC= SphinxSE engine
|
||||
SPIDER_DESC= Partitioning and XA-transactions engine
|
||||
TOKUDB_DESC= Fractal tree index tree data structure engine
|
||||
WSREP_DESC= Build wsrep clustering
|
||||
ZMQ_DESC= ZeroMQ support
|
||||
ZSTD_DESC+= Zstandard compression support (RocksDB only)
|
||||
.endif
|
||||
|
||||
CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \
|
||||
-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
|
||||
-DINSTALL_INCLUDEDIR="include/mysql" \
|
||||
-DINSTALL_INFODIR="info" \
|
||||
-DINSTALL_LIBDIR="lib/mysql" \
|
||||
-DINSTALL_MANDIR="share/man" \
|
||||
-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
|
||||
-DINSTALL_MYSQLSHAREDIR="share/mysql" \
|
||||
-DINSTALL_MYSQLTESTDIR= \
|
||||
-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
|
||||
-DINSTALL_SBINDIR="libexec" \
|
||||
-DINSTALL_SCRIPTDIR="bin" \
|
||||
-DINSTALL_SHAREDIR="share" \
|
||||
-DINSTALL_SQLBENCHDIR= \
|
||||
-DINSTALL_SUPPORTFILESDIR="share/mysql" \
|
||||
-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
|
||||
-DDEFAULT_SYSCONF2DIR="${ETCDIR}/conf.d" \
|
||||
-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
|
||||
-DWITH_SSL="${OPENSSLBASE}" \
|
||||
-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
|
||||
-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
|
||||
-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
|
||||
-DKRB5_CONFIG="${KRB5CONFIG}" \
|
||||
-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
|
||||
-DCOMPILATION_COMMENT="FreeBSD Ports" \
|
||||
-DCMAKE_PREFIX_PATH=${PREFIX}
|
||||
CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS
|
||||
CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS
|
||||
DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
|
||||
EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
|
||||
|
||||
DATADIR= ${PREFIX}/share/mysql
|
||||
ETCDIR= ${PREFIX}/etc/mysql
|
||||
|
||||
CONFLICTS_INSTALL= mariadb10[0-35-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
|
||||
mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \
|
||||
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
|
||||
mysqlwsrep*-server \
|
||||
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
|
||||
|
||||
FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
|
||||
GSSAPI_BASE_USES= gssapi
|
||||
GSSAPI_HEIMDAL_USES= gssapi:heimdal
|
||||
GSSAPI_MIT_USES= gssapi:mit
|
||||
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
|
||||
OPTIONS_SUB= yes
|
||||
SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \
|
||||
MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
|
||||
MARIADB_SOCK="${MARIADB_SOCK}"
|
||||
PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \
|
||||
MARIADB_GROUP="${MARIADB_GROUP}"
|
||||
|
||||
.if ${PKGNAMESUFFIX:M*-client}
|
||||
# MySQL-Client part
|
||||
CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
|
||||
CMAKE_OFF+= WITH_WSREP
|
||||
USES+= readline
|
||||
USE_LDCONFIG= ${PREFIX}/lib/mysql
|
||||
SUB_FILES+= my.cnf.sample client.cnf.sample
|
||||
PLIST_SUB+= MARIADB_RUNDIR="${MARIADB_RUNDIR}"
|
||||
.else # ! ${PKGNAMESUFFIX:M*-client}
|
||||
# MySQL-Server part
|
||||
USES+= mysql:104m
|
||||
USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
|
||||
USE_RC_SUBR= mysql-server
|
||||
USERS= ${MARIADB_USER}
|
||||
GROUPS= ${MARIADB_GROUP}
|
||||
CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
|
||||
CMAKE_OFF+= WITH_CLIENT
|
||||
SUB_FILES+= server.cnf.sample
|
||||
SUB_LIST+= MARIADB_LOGDIR="${MARIADB_LOGDIR}"
|
||||
PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}"
|
||||
|
||||
.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
|
||||
${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO
|
||||
${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
|
||||
.endfor
|
||||
INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE
|
||||
|
||||
CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
|
||||
CONNECT_EXTRA_USE= gnome=libxml2
|
||||
CONNECT_EXTRA_USES= gnome
|
||||
CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
|
||||
GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI
|
||||
LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON
|
||||
LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
|
||||
LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
|
||||
LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON
|
||||
LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF
|
||||
LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
|
||||
MROONGA_IMPLIES= LZ4
|
||||
MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c
|
||||
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
|
||||
libJudy.so:devel/judy
|
||||
ROCKSDB_USES= python
|
||||
ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD}
|
||||
SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON
|
||||
SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
|
||||
SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
|
||||
TOKUDB_IMPLIES= SNAPPY
|
||||
TOKUDB_PORTDOCS= README.md
|
||||
WSREP_CMAKE_BOOL= WITH_WSREP
|
||||
WSREP_LIB_DEPENDS= libgalera.so:databases/galera26
|
||||
WSREP_RUN_DEPENDS= bash:shells/bash \
|
||||
rsync:net/rsync \
|
||||
#stunnel:security/stunnel
|
||||
WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync
|
||||
ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
|
||||
ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON
|
||||
ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF
|
||||
ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
|
||||
|
||||
.for PLUGIN in ${DISABLED_PLUGINS}
|
||||
CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO
|
||||
.endfor
|
||||
|
||||
.endif # ${PKGNAMESUFFIX:M*-client}
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
|
||||
GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
|
||||
.endif
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${ARCH} != amd64
|
||||
PLIST_SUB+= WSREP="@comment "
|
||||
.endif
|
||||
|
||||
.if ${ARCH} == i386
|
||||
USE_GCC= yes
|
||||
CFLAGS+= -latomic -fasynchronous-unwind-tables
|
||||
.endif
|
||||
|
||||
.if ${OPSYS} == DragonFly
|
||||
CMAKE_OFF+= WITH_TOKUDB
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
|
||||
${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
|
||||
${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/mysys/my_default.c
|
||||
.if ${OPSYS} == DragonFly
|
||||
${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
|
||||
${WRKSRC}/cmake/os/DragonFly.cmake
|
||||
.endif
|
||||
|
||||
post-configure:
|
||||
${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
|
||||
-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
|
||||
${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
|
||||
|
||||
pre-install:
|
||||
${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
|
||||
|
||||
.if ${PKGNAMESUFFIX:M*-client}
|
||||
post-install:
|
||||
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
|
||||
${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
|
||||
${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
|
||||
${RM} -r ${STAGEDIR}${DATADIR} \
|
||||
${STAGEDIR}${PREFIX}/include/mysql/server
|
||||
${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
|
||||
${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc
|
||||
${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
|
||||
${MKDIR} ${STAGEDIR}/${MARIADB_RUNDIR}
|
||||
|
||||
post-install-GSSAPI_NONE-off:
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
|
||||
|
||||
.else # ! ${PKGNAMESUFFIX:M*-client}
|
||||
post-install:
|
||||
${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
|
||||
${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
|
||||
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
|
||||
${STAGEDIR}${PREFIX}/include/mysql/server/private \
|
||||
${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
|
||||
${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \
|
||||
${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
|
||||
${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \
|
||||
${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample || true
|
||||
${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR}
|
||||
.endif # ${PKGNAMESUFFIX:M*-client}
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
TIMESTAMP = 1685281835
|
||||
SHA256 (mariadb-10.4.29.tar.gz) = 5b2d338792e79e68d6a545e2b15603bbbf7618c739e5f820f57b1d6b22092130
|
||||
SIZE (mariadb-10.4.29.tar.gz) = 94859830
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
# Options specific to client applications, see
|
||||
# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups
|
||||
|
||||
# Options specific to all client programs
|
||||
[client]
|
||||
# port = 3306 # inherited from %%ETCDIR%%/my.cnf
|
||||
# socket = %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf
|
||||
|
||||
# Options specific to MariaDB client programs
|
||||
[client-mariadb]
|
||||
|
||||
#
|
||||
## Options for specific client Tools
|
||||
#
|
||||
|
||||
# Options read by `mysql`
|
||||
# Renamed from [mysql] starting with MariaDB 10.4.6.
|
||||
[mariadb-client] Options read by mysql. Available starting with MariaDB 10.4.6.
|
||||
prompt = \u@\h [\d]>\_
|
||||
no_auto_rehash
|
||||
|
||||
# Options read by `mysqldump`
|
||||
# Renamed from [mysqldump] starting with MariaDB 10.4.6.
|
||||
[mariadb-dump]
|
||||
max_allowed_packet = 256M
|
||||
quote_names
|
||||
quick
|
||||
|
||||
# Options read by `mysqladmin`
|
||||
# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
|
||||
[mariadb-admin]
|
||||
|
||||
# Options read by `mysqlbinlog`
|
||||
# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
|
||||
[mariadb-binlog]
|
||||
|
||||
# Options read by `mysqlcheck`
|
||||
# Renamed from [mysqlcheck] starting with MariaDB 10.4.6.
|
||||
[mariadb-check]
|
||||
|
||||
# Options read by `mysqlimport`
|
||||
# Renamed from [mysqlimport] starting with MariaDB 10.4.6.
|
||||
[mariadb-import]
|
||||
|
||||
# Options read by `mysqlshow`
|
||||
# Renamed from [mysqlshow] starting with MariaDB 10.4.6.
|
||||
[mariadb-show]
|
||||
|
||||
# Options read by `mysqlslap`
|
||||
# Renamed from [mysqlslap] starting with MariaDB 10.4.6.
|
||||
[mariadb-slap]
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
#
|
||||
# This group is read both by the client and the server
|
||||
# use it for options that affect everything, see
|
||||
# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-groups
|
||||
#
|
||||
[client-server]
|
||||
port = 3306
|
||||
socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%
|
||||
|
||||
#
|
||||
# include *.cnf from the config directory
|
||||
#
|
||||
!includedir %%ETCDIR%%/conf.d/
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# PROVIDE: mysql
|
||||
# REQUIRE: LOGIN
|
||||
# KEYWORD: shutdown
|
||||
#
|
||||
# Add the following line to /etc/rc.conf to enable mysql:
|
||||
# mysql_(instance_)?enable (bool): Set to "NO" by default.
|
||||
# Set it to "YES" to enable MySQL.
|
||||
# mysql_(instance_)?dbdir (str): Base database directory.
|
||||
# Default to "/var/db/mysql"
|
||||
# mysql_(instance_)?args (str): Custom additional arguments to be passed
|
||||
# to mysqld_safe (default empty).
|
||||
# mysql_(instance_)?pidfile (str): Custom PID file path and name.
|
||||
# Default to "${mysql_dbdir}/${hostname}.pid".
|
||||
# mysql_(instance_)?user (str): User to run mysqld as.
|
||||
# Default to "%%MARIADB_USER%%" created by the port
|
||||
# mysql_(instance_)?socket (str): Name of the socket file.
|
||||
# Default to "" and used from %%ETCDIR%%/my.cnf,
|
||||
# where default is "%%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%".
|
||||
# mysql_(instance_)?optfile (str): Server-specific option file.
|
||||
# Default to "${mysql_dbdir}/my.cnf".
|
||||
# mysql_instances (str): Set to "" by default.
|
||||
# If defined, list of instances to enable
|
||||
|
||||
. /etc/rc.subr
|
||||
|
||||
name="mysql"
|
||||
rcvar=mysql_enable
|
||||
|
||||
load_rc_config $name
|
||||
|
||||
: ${mysql_enable="NO"}
|
||||
: ${mysql_user="%%MARIADB_USER%%"}
|
||||
: ${mysql_dbdir="/var/db/mysql"}
|
||||
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
|
||||
|
||||
command="/usr/sbin/daemon"
|
||||
procname="%%PREFIX%%/libexec/mysqld"
|
||||
start_precmd="${name}_prestart"
|
||||
start_postcmd="${name}_poststart"
|
||||
|
||||
if [ -n "$2" ]; then
|
||||
instance="$2"
|
||||
load_rc_config ${name}_${instance}
|
||||
case "$mysql_instances" in
|
||||
"$2 "*|*" $2 "*|*" $2"|"$2")
|
||||
eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
|
||||
eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
|
||||
eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
|
||||
eval mysql_socket="\${mysql_${instance}_socket:-\"${mysql_socket}\"}"
|
||||
eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
|
||||
eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
|
||||
;;
|
||||
*)
|
||||
err 1 "$2 not found in mysql_instances" ;;
|
||||
esac
|
||||
else
|
||||
if [ -n "${mysql_instances}" -a -n "$1" ]; then
|
||||
for instance in ${mysql_instances}; do
|
||||
eval _enable="\${mysql_${instance}_enable}"
|
||||
case "${_enable:-${mysql_enable}}" in
|
||||
[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
|
||||
continue
|
||||
;;
|
||||
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
|
||||
;;
|
||||
*)
|
||||
if [ -z "$_enable" ]; then
|
||||
_var=mysql_enable
|
||||
else
|
||||
_var=mysql_${instance}_enable
|
||||
fi
|
||||
warn "Bad value" \
|
||||
"'${_enable:-${mysql_enable}}'" \
|
||||
"for ${_var}. " \
|
||||
"Instance ${instance} skipped."
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
echo "===> mysql instance: ${instance}"
|
||||
if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
|
||||
success="${instance} ${success}"
|
||||
else
|
||||
failed="${instance} (${retcode}) ${failed}"
|
||||
fi
|
||||
done
|
||||
exit 0
|
||||
else
|
||||
mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
|
||||
fi
|
||||
fi
|
||||
|
||||
pidfile=$mysql_pidfile
|
||||
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
|
||||
mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
|
||||
command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
|
||||
|
||||
mysql_create_auth_tables()
|
||||
{
|
||||
eval $mysql_install_db $mysql_install_db_args
|
||||
[ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
|
||||
}
|
||||
|
||||
mysql_prestart()
|
||||
{
|
||||
local dir
|
||||
for dir in /etc /etc/mysql; do
|
||||
if [ -f "${dir}/my.cnf" ]; then
|
||||
echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
if [ ! -d "${mysql_dbdir}/mysql/." ]; then
|
||||
mysql_create_auth_tables || return 1
|
||||
fi
|
||||
[ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
|
||||
if [ ! -d "${mysql_rundir}" ]; then
|
||||
install -d -o ${mysql_user} -g $(id -gn $mysql_user) "${mysql_rundir}"
|
||||
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
mysql_poststart()
|
||||
{
|
||||
local timeout=15
|
||||
while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
|
||||
timeout=$(( timeout - 1 ))
|
||||
sleep 1
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
run_rc_command "$1"
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -504,7 +504,9 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
|
||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
|
||||
)
|
||||
|
||||
+IF(FALSE)
|
||||
INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
|
||||
+ENDIF()
|
||||
|
||||
# MDEV-6526 these files are not installed anymore
|
||||
#INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
WITHOUT_SERVER installs server-only files
|
||||
|
||||
https://jira.mariadb.org/browse/MDEV-11790
|
||||
--- extra/CMakeLists.txt.orig 2018-10-02 09:45:40 UTC
|
||||
+++ extra/CMakeLists.txt
|
||||
@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
|
||||
ADD_DEPENDENCIES(innochecksum GenError)
|
||||
ENDIF()
|
||||
|
||||
-MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
|
||||
+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
|
||||
TARGET_LINK_LIBRARIES(replace mysys)
|
||||
|
||||
IF(UNIX)
|
||||
--- scripts/CMakeLists.txt.orig 2018-10-02 09:45:42 UTC
|
||||
+++ scripts/CMakeLists.txt
|
||||
@@ -241,7 +241,10 @@ ENDIF()
|
||||
SET(mysql_config_COMPONENT COMPONENT Development)
|
||||
SET(msql2mysql_COMPONENT COMPONENT Client)
|
||||
SET(mysqlaccess_COMPONENT COMPONENT Client)
|
||||
+SET(mysqlhotcopy_COMPONENT COMPONENT Client)
|
||||
+SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
|
||||
SET(mysql_find_rows_COMPONENT COMPONENT Client)
|
||||
+SET(mysql_setpermission_COMPONENT COMPONENT Client)
|
||||
SET(mytop_COMPONENT Mytop)
|
||||
|
||||
IF(WIN32)
|
||||
@@ -298,14 +301,14 @@ ELSE()
|
||||
# On Unix, most of the files end up in the bin directory
|
||||
SET(BIN_SCRIPTS
|
||||
msql2mysql
|
||||
- mysql_config
|
||||
- mysql_setpermission
|
||||
- mysql_secure_installation
|
||||
mysqlaccess
|
||||
+ mysqlhotcopy
|
||||
+ mysql_config
|
||||
mysql_convert_table_format
|
||||
mysql_find_rows
|
||||
+ mysql_secure_installation
|
||||
+ mysql_setpermission
|
||||
mytop
|
||||
- mysqlhotcopy
|
||||
${SERVER_SCRIPTS}
|
||||
${WSREP_SCRIPTS}
|
||||
${SYSTEMD_SCRIPTS}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2019-07-30 11:32:15 UTC
|
||||
+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
|
||||
@@ -12,6 +12,10 @@
|
||||
#include <jemalloc/jemalloc.h>
|
||||
#endif
|
||||
|
||||
+#ifdef __FreeBSD__
|
||||
+#define JEMALLOC_USABLE_SIZE_CONST const
|
||||
+#endif
|
||||
+
|
||||
#ifndef JEMALLOC_CXX_THROW
|
||||
#define JEMALLOC_CXX_THROW
|
||||
#endif
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- cmake/install_layout.cmake.orig 2020-05-09 19:27:56 UTC
|
||||
+++ cmake/install_layout.cmake
|
||||
@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files
|
||||
SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
|
||||
|
||||
SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock")
|
||||
-SET(INSTALL_PAMDIR_STANDALONE "share")
|
||||
-SET(INSTALL_PAMDATADIR_STANDALONE "share")
|
||||
+SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/plugin")
|
||||
+SET(INSTALL_PAMDATADIR_STANDALONE "etc/mysql")
|
||||
#
|
||||
# RPM layout
|
||||
#
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
--- include/my_cpu.h.orig 2021-09-27 13:32:48 UTC
|
||||
+++ include/my_cpu.h
|
||||
@@ -23,7 +23,8 @@
|
||||
The defines are the same ones used by the linux kernel
|
||||
*/
|
||||
|
||||
-#ifdef _ARCH_PWR8
|
||||
+#if defined(_ARCH_PWR8)
|
||||
+#if defined(linux)
|
||||
#include <sys/platform/ppc.h>
|
||||
/* Very low priority */
|
||||
#define HMT_very_low() __ppc_set_ppr_very_low()
|
||||
@@ -37,6 +38,22 @@
|
||||
#define HMT_medium_high() __ppc_set_ppr_med_high()
|
||||
/* High priority */
|
||||
#define HMT_high() asm volatile("or 3,3,3")
|
||||
+#elif defined(__FreeBSD__)
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/sysctl.h>
|
||||
+/* Very low priority */
|
||||
+#define HMT_very_low() __asm__ volatile ("or 31,31,31")
|
||||
+/* Low priority */
|
||||
+#define HMT_low() __asm__ volatile ("or 1,1,1")
|
||||
+/* Medium low priority */
|
||||
+#define HMT_medium_low() __asm__ volatile ("or 6,6,6")
|
||||
+/* Medium priority */
|
||||
+#define HMT_medium() __asm__ volatile ("or 2,2,2")
|
||||
+/* Medium high priority */
|
||||
+#define HMT_medium_high() __asm__ volatile ("or 5,5,5")
|
||||
+/* High priority */
|
||||
+#define HMT_high() asm volatile("or 3,3,3")
|
||||
+#endif
|
||||
#else
|
||||
#define HMT_very_low()
|
||||
#define HMT_low()
|
||||
@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void)
|
||||
__asm__ __volatile__ ("pause");
|
||||
#endif
|
||||
#elif defined(_ARCH_PWR8)
|
||||
+#if defined(linux)
|
||||
__ppc_get_timebase();
|
||||
+#elif defined(__FreeBSD__)
|
||||
+ uint64_t __tb;
|
||||
+ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb));
|
||||
+#endif
|
||||
#elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
|
||||
/* Mainly, prevent the compiler from optimizing away delay loops */
|
||||
#ifdef _aarch64_
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
--- libmariadb/include/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
|
||||
+++ libmariadb/include/CMakeLists.txt
|
||||
@@ -21,6 +21,7 @@ IF(WIN32)
|
||||
SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
|
||||
ENDIF()
|
||||
|
||||
+IF(NOT WITHOUT_CLIENT)
|
||||
INSTALL(FILES
|
||||
${MARIADB_CLIENT_INCLUDES}
|
||||
DESTINATION ${INSTALL_INCLUDEDIR}
|
||||
@@ -33,3 +34,4 @@ INSTALL(FILES
|
||||
${MARIADB_ADDITIONAL_INCLUDES}
|
||||
DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
|
||||
COMPONENT Development)
|
||||
+ENDIF()
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
--- libmariadb/libmariadb/CMakeLists.txt.orig 2022-08-10 10:25:18 UTC
|
||||
+++ libmariadb/libmariadb/CMakeLists.txt
|
||||
@@ -464,6 +464,7 @@ IF(NOT WIN32)
|
||||
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}")
|
||||
ENDIF()
|
||||
|
||||
+IF(NOT WITHOUT_CLIENT)
|
||||
INSTALL(TARGETS mariadbclient
|
||||
COMPONENT Development
|
||||
DESTINATION ${INSTALL_LIBDIR})
|
||||
@@ -480,6 +481,8 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTA
|
||||
COMPONENT SharedLibraries NAMELINK_SKIP)
|
||||
INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
|
||||
COMPONENT Development NAMELINK_ONLY)
|
||||
+ENDIF()
|
||||
+
|
||||
ENDIF()
|
||||
|
||||
IF(MSVC)
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
--- libmariadb/plugins/auth/CMakeLists.txt.orig 2019-11-07 05:52:21 UTC
|
||||
+++ libmariadb/plugins/auth/CMakeLists.txt
|
||||
@@ -3,6 +3,7 @@ SET(AUTH_DIR ${CC_SOURCE_DIR}/plugins/auth)
|
||||
INCLUDE_DIRECTORIES(${AUTH_DIR})
|
||||
INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include)
|
||||
|
||||
+IF(NOT WITHOUT_CLIENT)
|
||||
SET(CRYPTO_PLUGIN 1)
|
||||
IF(WIN32)
|
||||
SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c)
|
||||
@@ -18,6 +19,7 @@ ELSEIF(WITH_SSL STREQUAL "GNUTLS")
|
||||
ELSE()
|
||||
UNSET(CRYPTO_PLUGIN)
|
||||
ENDIF()
|
||||
+ENDIF()
|
||||
|
||||
#native password
|
||||
REGISTER_PLUGIN(TARGET mysql_native_password
|
||||
@@ -119,10 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
|
||||
DEFAULT STATIC
|
||||
SOURCES ${AUTH_DIR}/old_password.c)
|
||||
|
||||
+IF(NOT WITHOUT_CLIENT)
|
||||
# Cleartext
|
||||
REGISTER_PLUGIN(TARGET mysql_clear_password
|
||||
TYPE MARIADB_CLIENT_PLUGIN_AUTH
|
||||
CONFIGURATIONS DYNAMIC STATIC OFF
|
||||
DEFAULT DYNAMIC
|
||||
SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
|
||||
-
|
||||
+ENDIF()
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
|
||||
|
||||
--- libservices/CMakeLists.txt.orig 2017-05-14 23:13:16 UTC
|
||||
+++ libservices/CMakeLists.txt
|
||||
@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
|
||||
)
|
||||
|
||||
ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
|
||||
+IF(FALSE)
|
||||
INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
|
||||
+ENDIF()
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
--- mysys/my_default.c.orig 2017-05-14 23:13:17 UTC
|
||||
+++ mysys/my_default.c
|
||||
@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
|
||||
{
|
||||
MY_STAT stat_info;
|
||||
if (!my_stat(name,&stat_info,MYF(0)))
|
||||
- return 1;
|
||||
+ return 0;
|
||||
/*
|
||||
Ignore world-writable regular files.
|
||||
This is mainly done to protect us to not read a file created by
|
||||
@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
|
||||
if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
|
||||
return 1; /* Ignore wrong files */
|
||||
|
||||
+ if (strstr(name, "/etc") == name)
|
||||
+ {
|
||||
+ fprintf(stderr,
|
||||
+ "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
|
||||
+ name,name);
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
|
||||
{
|
||||
line++;
|
||||
@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
|
||||
if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
|
||||
*end++= '.';
|
||||
strxmov(end, conf_file, *ext, " ", NullS);
|
||||
- fputs(name, stdout);
|
||||
+ if (strstr(name, "/etc") != name)
|
||||
+ fputs(name, stdout);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1192,13 +1201,10 @@ static const char **init_default_directo
|
||||
|
||||
#else
|
||||
|
||||
-#if defined(DEFAULT_SYSCONFDIR)
|
||||
- if (DEFAULT_SYSCONFDIR[0])
|
||||
- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
|
||||
-#else
|
||||
errors += add_directory(alloc, "/etc/", dirs);
|
||||
errors += add_directory(alloc, "/etc/mysql/", dirs);
|
||||
-#endif /* DEFAULT_SYSCONFDIR */
|
||||
+ errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
|
||||
+ errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
--- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC
|
||||
+++ storage/oqgraph/oqgraph_judy.cc
|
||||
@@ -27,7 +27,7 @@
|
||||
/*
|
||||
Currently the only active code that can return error is:
|
||||
judy_bitset::reset()/J1U()
|
||||
- judy_bitset::setbit()/J1S()
|
||||
+ judy_bitset::jsetbit()/J1S()
|
||||
|
||||
In most cases errors are either about wrong parameters passed to Judy
|
||||
functions or internal structures corruption. These definitely deserve
|
||||
@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
|
||||
return rc == 1;
|
||||
}
|
||||
|
||||
-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
|
||||
+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
|
||||
{
|
||||
int rc;
|
||||
J1S(rc, array, n);
|
||||
--- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC
|
||||
+++ storage/oqgraph/oqgraph_judy.h
|
||||
@@ -63,7 +63,7 @@ namespace open_query
|
||||
if (!val)
|
||||
return reset(n);
|
||||
else
|
||||
- return setbit(n);
|
||||
+ return jsetbit(n);
|
||||
}
|
||||
|
||||
judy_bitset& set(const judy_bitset& src);
|
||||
@@ -115,7 +115,7 @@ namespace open_query
|
||||
private:
|
||||
mutable void* array;
|
||||
|
||||
- judy_bitset& setbit(size_type n);
|
||||
+ judy_bitset& jsetbit(size_type n);
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- pcre/CMakeLists.txt.orig 2017-08-17 10:05:39 UTC
|
||||
+++ pcre/CMakeLists.txt
|
||||
@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT)
|
||||
MESSAGE(STATUS "")
|
||||
ENDIF(PCRE_SHOW_REPORT)
|
||||
|
||||
+IF(FALSE)
|
||||
INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development)
|
||||
+ENDIF()
|
||||
|
||||
# end CMakeLists.txt
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- plugin/auth_pam/testing/CMakeLists.txt.orig 2019-11-07 05:52:22 UTC
|
||||
+++ plugin/auth_pam/testing/CMakeLists.txt
|
||||
@@ -5,5 +5,7 @@ SET_TARGET_PROPERTIES (pam_mariadb_mtr PROPERTIES PREF
|
||||
TARGET_LINK_LIBRARIES(pam_mariadb_mtr pam)
|
||||
|
||||
SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)
|
||||
+IF(FALSE)
|
||||
INSTALL(TARGETS pam_mariadb_mtr ${dest})
|
||||
INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest})
|
||||
+ENDIF()
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- scripts/mysql_config.sh.orig 2017-05-24 09:15:23 UTC
|
||||
+++ scripts/mysql_config.sh
|
||||
@@ -106,7 +106,9 @@ fi
|
||||
|
||||
# Create options
|
||||
libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
|
||||
+libs="$libs -L%%LOCALBASE%%/lib "
|
||||
embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
|
||||
+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
|
||||
|
||||
include="-I$pkgincludedir"
|
||||
if [ "$basedir" != "/usr" ]; then
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
--- scripts/mysqld_safe.sh.orig 2017-05-24 09:15:23 UTC
|
||||
+++ scripts/mysqld_safe.sh
|
||||
@@ -568,11 +568,11 @@ fi
|
||||
|
||||
if test -z "$MYSQL_HOME"
|
||||
then
|
||||
- if test -r "$DATADIR/my.cnf"
|
||||
+ if test -r "$DATADIR/etc/my.cnf"
|
||||
then
|
||||
log_error "WARNING: Found $DATADIR/my.cnf
|
||||
The data directory is not a valid location for my.cnf, please move it to
|
||||
-$MY_BASEDIR_VERSION/my.cnf"
|
||||
+$MY_BASEDIR_VERSION/etc/my.cnf"
|
||||
fi
|
||||
MYSQL_HOME=$MY_BASEDIR_VERSION
|
||||
fi
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- scripts/wsrep_sst_mariabackup.sh.orig 2022-05-24 12:49:43 UTC
|
||||
+++ scripts/wsrep_sst_mariabackup.sh
|
||||
@@ -725,7 +725,7 @@ recv_joiner()
|
||||
local ltcmd="$tcmd"
|
||||
if [ $tmt -gt 0 ]; then
|
||||
if [ -n "$(commandex timeout)" ]; then
|
||||
- if timeout --help | grep -qw -F -- '-k'; then
|
||||
+ if timeout --help 2>&1 | grep -qw -F -- '-k'; then
|
||||
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
|
||||
else
|
||||
ltcmd="timeout -s9 $tmt $tcmd"
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
--- sql/mysqld.cc.orig 2021-05-05 15:26:23 UTC
|
||||
+++ sql/mysqld.cc
|
||||
@@ -206,7 +206,7 @@ typedef fp_except fp_except_t;
|
||||
|
||||
inline void setup_fpu()
|
||||
{
|
||||
-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
|
||||
+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
|
||||
/* We can't handle floating point exceptions with threads, so disable
|
||||
this on freebsd
|
||||
Don't fall for overflow, underflow,divide-by-zero or loss of precision.
|
||||
@@ -219,7 +219,7 @@ inline void setup_fpu()
|
||||
fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ |
|
||||
FP_X_IMP));
|
||||
#endif /* FP_X_DNML */
|
||||
-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
|
||||
+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && defined(FP_X_INV) */
|
||||
|
||||
#ifdef HAVE_FEDISABLEEXCEPT
|
||||
fedisableexcept(FE_ALL_EXCEPT);
|
||||
@@ -5033,8 +5033,9 @@ static void init_ssl()
|
||||
while ((err= ERR_get_error()))
|
||||
sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
|
||||
}
|
||||
- else
|
||||
+ else {
|
||||
ERR_remove_state(0);
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
--- storage/innobase/lz4.cmake.orig 2021-08-02 18:07:03 UTC
|
||||
+++ storage/innobase/lz4.cmake
|
||||
@@ -17,20 +17,28 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
|
||||
|
||||
MACRO (MYSQL_CHECK_LZ4)
|
||||
IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
|
||||
- CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
|
||||
- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
|
||||
- CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
|
||||
-
|
||||
- IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
|
||||
- SET(HAVE_INNODB_LZ4 TRUE)
|
||||
- ADD_DEFINITIONS(-DHAVE_LZ4=1)
|
||||
- IF (HAVE_LZ4_COMPRESS_DEFAULT)
|
||||
- ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
|
||||
+ find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
|
||||
+ find_library(LZ4_LIBRARY NAMES lz4)
|
||||
+ IF (LZ4_LIBRARY)
|
||||
+ get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
|
||||
+# MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
|
||||
+ IF (LZ4_INCLUDE_DIR)
|
||||
+ SET(HAVE_LZ4_H YES)
|
||||
ENDIF()
|
||||
- LINK_LIBRARIES(lz4)
|
||||
- ELSE()
|
||||
- IF (WITH_INNODB_LZ4 STREQUAL "ON")
|
||||
- MESSAGE(FATAL_ERROR "Required lz4 library is not found")
|
||||
+ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
|
||||
+ CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
|
||||
+
|
||||
+ IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
|
||||
+ SET(HAVE_INNODB_LZ4 TRUE)
|
||||
+ ADD_DEFINITIONS(-DHAVE_LZ4=1)
|
||||
+ IF (HAVE_LZ4_COMPRESS_DEFAULT)
|
||||
+ ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
|
||||
+ ENDIF()
|
||||
+ LINK_LIBRARIES(innobase ${LZ4_LIBRARY})
|
||||
+ ELSE()
|
||||
+ IF (WITH_INNODB_LZ4 STREQUAL "ON")
|
||||
+ MESSAGE(FATAL_ERROR "Required lz4 library is not found")
|
||||
+ ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
--- storage/innobase/lzo.cmake.orig 2021-08-02 18:07:03 UTC
|
||||
+++ storage/innobase/lzo.cmake
|
||||
@@ -17,13 +17,17 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING
|
||||
|
||||
MACRO (MYSQL_CHECK_LZO)
|
||||
IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
|
||||
- CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
|
||||
- CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB)
|
||||
-
|
||||
+ find_path(LZO_INCLUDE NAMES lzo/lzo1x.h)
|
||||
+ find_library(LZO_LIBRARY NAMES lzo2)
|
||||
+ get_filename_component(LZO_LIBDIR ${LZO_LIBRARY} DIRECTORY)
|
||||
+ IF (LZO_INCLUDE)
|
||||
+ SET(HAVE_LZO_H 1)
|
||||
+ ENDIF()
|
||||
+ CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB)
|
||||
IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
|
||||
SET(HAVE_INNODB_LZO TRUE)
|
||||
ADD_DEFINITIONS(-DHAVE_LZO=1)
|
||||
- LINK_LIBRARIES(lzo2)
|
||||
+ LINK_LIBRARIES(${LZO_LIBRARY})
|
||||
ELSE()
|
||||
IF (WITH_INNODB_LZO STREQUAL "ON")
|
||||
MESSAGE(FATAL_ERROR "Required lzo library is not found")
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
--- storage/innobase/snappy.cmake.orig 2021-08-02 18:07:03 UTC
|
||||
+++ storage/innobase/snappy.cmake
|
||||
@@ -17,13 +17,19 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING
|
||||
|
||||
MACRO (MYSQL_CHECK_SNAPPY)
|
||||
IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO")
|
||||
- CHECK_INCLUDE_FILES(snappy-c.h HAVE_SNAPPY_H)
|
||||
- CHECK_LIBRARY_EXISTS(snappy snappy_uncompress "" HAVE_SNAPPY_SHARED_LIB)
|
||||
+ find_path(SNAPPY_INCLUDE_DIR NAMES snappy-c.h)
|
||||
+ find_library(SNAPPY_LIBRARY NAMES snappy)
|
||||
+ get_filename_component(SNAPPY_LIBDIR ${SNAPPY_LIBRARY} DIRECTORY)
|
||||
+ IF (SNAPPY_INCLUDE_DIR)
|
||||
+ SET(HAVE_SNAPPY_H 1)
|
||||
+ ENDIF()
|
||||
+ CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB)
|
||||
+#MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ")
|
||||
|
||||
IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H)
|
||||
SET(HAVE_INNODB_SNAPPY TRUE)
|
||||
ADD_DEFINITIONS(-DHAVE_SNAPPY=1)
|
||||
- LINK_LIBRARIES(snappy)
|
||||
+ LINK_LIBRARIES(${SNAPPY_LIBRARY})
|
||||
ELSE()
|
||||
IF (WITH_INNODB_SNAPPY STREQUAL "ON")
|
||||
MESSAGE(FATAL_ERROR "Required snappy library is not found")
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5
|
||||
|
||||
--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2017-05-14 23:13:18 UTC
|
||||
+++ storage/mroonga/vendor/groonga/CMakeLists.txt
|
||||
@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COM
|
||||
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered")
|
||||
endif()
|
||||
|
||||
+if(CMAKE_COMPILER_IS_CLANGCXX)
|
||||
+ MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions")
|
||||
+endif()
|
||||
+
|
||||
if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC)
|
||||
# For old CMake
|
||||
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
--- storage/tokudb/CMakeLists.txt.orig 2017-09-25 08:33:26.000000000 +0200
|
||||
+++ storage/tokudb/CMakeLists.txt 2017-09-28 21:46:55.119327000 +0200
|
||||
@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
|
||||
|
||||
TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
|
||||
${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++)
|
||||
-
|
||||
-SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
|
||||
-SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2017-05-14 23:13:20 UTC
|
||||
+++ storage/tokudb/PerconaFT/CMakeLists.txt
|
||||
@@ -80,7 +80,7 @@ add_subdirectory(src)
|
||||
add_subdirectory(ftcxx)
|
||||
add_subdirectory(tools)
|
||||
|
||||
-INSTALL_DOCUMENTATION(README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
|
||||
+INSTALL_DOCUMENTATION(README.md
|
||||
COMPONENT Server)
|
||||
|
||||
## build tags
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
|
||||
|
||||
--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-07 05:52:23 UTC
|
||||
+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
|
||||
@@ -1,5 +1,12 @@
|
||||
include(ExternalProject)
|
||||
|
||||
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
+ include_directories("/usr/include")
|
||||
+
|
||||
+ add_library(lzma SHARED IMPORTED)
|
||||
+ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
|
||||
+ "/usr/lib/liblzma.so")
|
||||
+ELSE()
|
||||
## add lzma with an external project
|
||||
set(xz_configure_opts --with-pic --enable-static)
|
||||
if (APPLE)
|
||||
@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
|
||||
set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
|
||||
add_dependencies(lzma build_lzma)
|
||||
+ENDIF()
|
||||
|
||||
+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
+ include_directories("%%LOCALBASE%%/include")
|
||||
|
||||
+ add_library(snappy SHARED IMPORTED)
|
||||
+ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
|
||||
+ "%%LOCALBASE%%/lib/libsnappy.so")
|
||||
+ELSE()
|
||||
## add snappy with an external project
|
||||
set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
|
||||
if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
|
||||
@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
|
||||
set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
|
||||
add_dependencies(snappy build_snappy)
|
||||
+ENDIF()
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
Fix build error
|
||||
|
||||
--- storage/tokudb/PerconaFT/portability/memory.cc.orig 2017-05-14 23:13:21 UTC
|
||||
+++ storage/tokudb/PerconaFT/portability/memory.cc
|
||||
@@ -42,11 +42,6 @@ Copyright (c) 2006, 2015, Percona and/or
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
-#if defined(HAVE_MALLOC_H)
|
||||
-# include <malloc.h>
|
||||
-#elif defined(HAVE_SYS_MALLOC_H)
|
||||
-# include <sys/malloc.h>
|
||||
-#endif
|
||||
#include <dlfcn.h>
|
||||
#include <toku_race_tools.h>
|
||||
#include "memory.h"
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
|
||||
|
||||
--- support-files/CMakeLists.txt.orig 2017-05-14 23:13:28 UTC
|
||||
+++ support-files/CMakeLists.txt
|
||||
@@ -83,7 +83,9 @@ IF(UNIX)
|
||||
CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
|
||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
|
||||
|
||||
+IF(FALSE)
|
||||
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
|
||||
+ENDIF()
|
||||
|
||||
SET(bindir ${INSTALL_BINDIRABS})
|
||||
SET(sbindir ${INSTALL_SBINDIRABS})
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
[
|
||||
{ type: install
|
||||
message: <<EOM
|
||||
MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
|
||||
my.cnf. Please move existing my.cnf files from those paths to
|
||||
%%PREFIX%%/etc/mysql or %%PREFIX%%/etc. Sample
|
||||
configuration files are provided in %%PREFIX%%/etc/mysql
|
||||
and %%PREFIX%%/etc/mysql/conf.d.
|
||||
|
||||
This port does NOT include the mytop perl script, this is included in
|
||||
the MariaDB tarball but the most recent version can be found in the
|
||||
databases/mytop port
|
||||
EOM
|
||||
}
|
||||
{ type: upgrade
|
||||
message: <<EOM
|
||||
The default MySQL socket location has moved from /tmp to %%MARIADB_RUNDIR%%
|
||||
for both client and server packages. Make sure you update your configurations
|
||||
in /var/db/mysql and %%PREFIX%%/etc.
|
||||
|
||||
Remember to run mariadb-upgrade (with the optional --datadir=<dbdir> flag)
|
||||
the first time you start the MySQL server after an upgrade from an
|
||||
earlier version.
|
||||
EOM
|
||||
}
|
||||
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
# Options specific to server applications, see
|
||||
# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups
|
||||
|
||||
# Options specific to all server programs
|
||||
[server]
|
||||
|
||||
# Options specific to MariaDB server programs
|
||||
[server-mariadb]
|
||||
|
||||
#
|
||||
# Options for specific server tools
|
||||
#
|
||||
|
||||
[mysqld]
|
||||
user = %%MARIADB_USER%%
|
||||
# port = 3306 # inherited from %%ETCDIR%%/my.cnf
|
||||
# socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
|
||||
bind-address = 127.0.0.1
|
||||
basedir = %%PREFIX%%
|
||||
datadir = /var/db/mysql
|
||||
net_retry_count = 16384
|
||||
log_error = %%MARIADB_LOGDIR%%/mysqld.err
|
||||
# [mysqld] configuration for ZFS
|
||||
# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar
|
||||
# Create separate datasets for data and logs, eg
|
||||
# zroot/mysql compression=on recordsize=128k atime=off
|
||||
# zroot/mysql/data recordsize=16k
|
||||
# zroot/mysql/logs
|
||||
# datadir = /var/db/mysql/data
|
||||
# innodb_log_group_home_dir = /var/db/mysql/log
|
||||
# audit_log_file = /var/db/mysql/log/audit.log
|
||||
# general_log_file = /var/db/mysql/log/general.log
|
||||
# log_bin = /var/db/mysql/log/mysql-bin
|
||||
# relay_log = /var/db/mysql/log/relay-log
|
||||
# slow_query_log_file = /var/db/mysql/log/slow.log
|
||||
# innodb_doublewrite = 0
|
||||
# innodb_flush_method = O_DSYNC
|
||||
|
||||
# Options read by `mysqld_safe`
|
||||
# Renamed from [mysqld_safe] starting with MariaDB 10.4.6.
|
||||
[mariadb_safe]
|
||||
|
||||
# Options read my `mariabackup`
|
||||
[mariabackup]
|
||||
|
||||
# Options read by `mysql_upgrade`
|
||||
# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6.
|
||||
[mariadb-upgrade]
|
||||
|
||||
# Specific options read by the mariabackup SST method
|
||||
[sst]
|
||||
|
||||
# Options read by `mysqlbinlog`
|
||||
# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
|
||||
[mariadb-binlog]
|
||||
|
||||
# Options read by `mysqladmin`
|
||||
# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
|
||||
[mariadb-admin]
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
MariaDB is a database server that offers drop-in replacement functionality
|
||||
for MySQL. MariaDB is built by some of the original authors of MySQL, with
|
||||
assistance from the broader community of Free and open source software
|
||||
developers. In addition to the core functionality of MySQL, MariaDB offers
|
||||
a rich set of feature enhancements including alternate storage engines,
|
||||
server optimizations, and patches.
|
||||
|
||||
MariaDB is primarily driven by developers at Monty Program, a company
|
||||
founded by Michael "Monty" Widenius, the original author of MySQL, but
|
||||
this is not the whole story about MariaDB. On the "About MariaDB" page you
|
||||
will find more information about all participants in the MariaDB community,
|
||||
including storage engines XtraDB and PBXT.
|
||||
|
|
@ -1,449 +0,0 @@
|
|||
bin/aria_chk
|
||||
bin/aria_dump_log
|
||||
bin/aria_ftdump
|
||||
bin/aria_pack
|
||||
bin/aria_read_log
|
||||
%%INNOBASE%%bin/innochecksum
|
||||
%%INNOBASE%%bin/mariabackup
|
||||
bin/mariadb-backup
|
||||
bin/mariadb-dumpslow
|
||||
bin/mariadb-embedded
|
||||
bin/mariadb-fix-extensions
|
||||
bin/mariadb-install-db
|
||||
%%ROCKSDB%%bin/mariadb-ldb
|
||||
bin/mariadb-secure-installation
|
||||
bin/mariadb-tzinfo-to-sql
|
||||
bin/mariadb-upgrade
|
||||
bin/mariadbd-multi
|
||||
bin/mariadbd-safe
|
||||
bin/mariadbd-safe-helper
|
||||
bin/mariadb-waitpid
|
||||
%%INNOBASE%%bin/mbstream
|
||||
bin/my_print_defaults
|
||||
bin/myisam_ftdump
|
||||
bin/myisamchk
|
||||
bin/myisamlog
|
||||
bin/myisampack
|
||||
%%ROCKSDB%%bin/myrocks_hotbackup
|
||||
bin/mysql_client_test
|
||||
bin/mysql_client_test_embedded
|
||||
bin/mysql_embedded
|
||||
bin/mysql_fix_extensions
|
||||
bin/mysql_install_db
|
||||
%%ROCKSDB%%bin/mysql_ldb
|
||||
bin/mysql_plugin
|
||||
bin/mysql_secure_installation
|
||||
bin/mysql_tzinfo_to_sql
|
||||
bin/mysql_upgrade
|
||||
bin/mysql_waitpid
|
||||
bin/mysqld_multi
|
||||
bin/mysqld_safe
|
||||
bin/mysqld_safe_helper
|
||||
bin/mysqldumpslow
|
||||
@comment bin/mysqltest_embedded
|
||||
bin/perror
|
||||
bin/resolve_stack_dump
|
||||
bin/resolveip
|
||||
%%ROCKSDB%%bin/sst_dump
|
||||
@comment bin/test-connect-t
|
||||
%%TOKUDB%%bin/tokuft_logprint
|
||||
%%TOKUDB%%bin/tokuftdump
|
||||
%%WSREP%%bin/wsrep_sst_backup
|
||||
%%WSREP%%bin/wsrep_sst_common
|
||||
%%WSREP%%bin/wsrep_sst_mariabackup
|
||||
%%WSREP%%bin/wsrep_sst_mysqldump
|
||||
%%WSREP%%bin/wsrep_sst_rsync
|
||||
%%WSREP%%bin/wsrep_sst_rsync_wan
|
||||
@sample %%ETCDIR%%/conf.d/server.cnf.sample
|
||||
%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
|
||||
@sample %%ETCDIR%%/user_map.conf.sample
|
||||
@comment data/test/db.opt
|
||||
include/mysql/server/big_endian.h
|
||||
include/mysql/server/byte_order_generic.h
|
||||
include/mysql/server/byte_order_generic_x86.h
|
||||
include/mysql/server/byte_order_generic_x86_64.h
|
||||
include/mysql/server/decimal.h
|
||||
include/mysql/server/errmsg.h
|
||||
include/mysql/server/handler_ername.h
|
||||
include/mysql/server/handler_state.h
|
||||
include/mysql/server/json_lib.h
|
||||
include/mysql/server/keycache.h
|
||||
include/mysql/server/little_endian.h
|
||||
include/mysql/server/m_ctype.h
|
||||
include/mysql/server/m_string.h
|
||||
include/mysql/server/ma_dyncol.h
|
||||
include/mysql/server/mariadb_capi_rename.h
|
||||
include/mysql/server/my_alloc.h
|
||||
include/mysql/server/my_alloca.h
|
||||
include/mysql/server/my_attribute.h
|
||||
include/mysql/server/my_byteorder.h
|
||||
include/mysql/server/my_compiler.h
|
||||
include/mysql/server/my_config.h
|
||||
include/mysql/server/my_dbug.h
|
||||
include/mysql/server/my_decimal_limits.h
|
||||
include/mysql/server/my_dir.h
|
||||
include/mysql/server/my_getopt.h
|
||||
include/mysql/server/my_global.h
|
||||
include/mysql/server/my_list.h
|
||||
include/mysql/server/my_net.h
|
||||
include/mysql/server/my_pthread.h
|
||||
include/mysql/server/my_sys.h
|
||||
include/mysql/server/my_valgrind.h
|
||||
include/mysql/server/my_xml.h
|
||||
include/mysql/server/mysql.h
|
||||
include/mysql/server/mysql/auth_dialog_client.h
|
||||
include/mysql/server/mysql/client_plugin.h
|
||||
include/mysql/server/mysql/plugin.h
|
||||
include/mysql/server/mysql/plugin_audit.h
|
||||
include/mysql/server/mysql/plugin_auth.h
|
||||
include/mysql/server/mysql/plugin_auth_common.h
|
||||
include/mysql/server/mysql/plugin_encryption.h
|
||||
include/mysql/server/mysql/plugin_ftparser.h
|
||||
include/mysql/server/mysql/plugin_password_validation.h
|
||||
include/mysql/server/mysql/psi/mysql_file.h
|
||||
include/mysql/server/mysql/psi/mysql_idle.h
|
||||
include/mysql/server/mysql/psi/mysql_socket.h
|
||||
include/mysql/server/mysql/psi/mysql_stage.h
|
||||
include/mysql/server/mysql/psi/mysql_statement.h
|
||||
include/mysql/server/mysql/psi/mysql_table.h
|
||||
include/mysql/server/mysql/psi/mysql_thread.h
|
||||
include/mysql/server/mysql/psi/psi.h
|
||||
include/mysql/server/mysql/psi/psi_abi_v0.h
|
||||
include/mysql/server/mysql/psi/psi_abi_v1.h
|
||||
include/mysql/server/mysql/psi/psi_abi_v2.h
|
||||
include/mysql/server/mysql/psi/psi_base.h
|
||||
include/mysql/server/mysql/psi/psi_memory.h
|
||||
include/mysql/server/mysql/service_base64.h
|
||||
include/mysql/server/mysql/service_debug_sync.h
|
||||
include/mysql/server/mysql/service_encryption.h
|
||||
include/mysql/server/mysql/service_encryption_scheme.h
|
||||
include/mysql/server/mysql/service_json.h
|
||||
include/mysql/server/mysql/service_kill_statement.h
|
||||
include/mysql/server/mysql/service_logger.h
|
||||
include/mysql/server/mysql/service_md5.h
|
||||
include/mysql/server/mysql/service_my_crypt.h
|
||||
include/mysql/server/mysql/service_my_print_error.h
|
||||
include/mysql/server/mysql/service_my_snprintf.h
|
||||
include/mysql/server/mysql/service_progress_report.h
|
||||
include/mysql/server/mysql/service_sha1.h
|
||||
include/mysql/server/mysql/service_sha2.h
|
||||
include/mysql/server/mysql/service_thd_alloc.h
|
||||
include/mysql/server/mysql/service_thd_autoinc.h
|
||||
include/mysql/server/mysql/service_thd_error_context.h
|
||||
include/mysql/server/mysql/service_thd_rnd.h
|
||||
include/mysql/server/mysql/service_thd_specifics.h
|
||||
include/mysql/server/mysql/service_thd_timezone.h
|
||||
include/mysql/server/mysql/service_thd_wait.h
|
||||
%%WSREP%%include/mysql/server/mysql/service_wsrep.h
|
||||
include/mysql/server/mysql/services.h
|
||||
include/mysql/server/mysql_com.h
|
||||
include/mysql/server/mysql_com_server.h
|
||||
include/mysql/server/mysql_embed.h
|
||||
include/mysql/server/mysql_time.h
|
||||
include/mysql/server/mysql_version.h
|
||||
include/mysql/server/mysqld_ername.h
|
||||
include/mysql/server/mysqld_error.h
|
||||
include/mysql/server/pack.h
|
||||
include/mysql/server/sql_common.h
|
||||
include/mysql/server/sql_state.h
|
||||
include/mysql/server/sslopt-case.h
|
||||
include/mysql/server/sslopt-longopts.h
|
||||
include/mysql/server/sslopt-vars.h
|
||||
include/mysql/server/typelib.h
|
||||
@comment lib/mysql/libmariadb.a
|
||||
@comment lib/mysql/libmariadbclient.a
|
||||
lib/mysql/libmariadbd.a
|
||||
lib/mysql/libmariadbd.so
|
||||
lib/mysql/libmariadbd.so.19
|
||||
lib/mysql/libmysqld.a
|
||||
lib/mysql/libmysqld.so
|
||||
lib/mysql/plugin/adt_null.so
|
||||
lib/mysql/plugin/auth_0x0100.so
|
||||
lib/mysql/plugin/auth_ed25519.so
|
||||
%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
|
||||
lib/mysql/plugin/auth_pam.so
|
||||
lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
|
||||
lib/mysql/plugin/auth_pam_v1.so
|
||||
lib/mysql/plugin/caching_sha2_password.so
|
||||
lib/mysql/plugin/debug_key_management.so
|
||||
lib/mysql/plugin/disks.so
|
||||
lib/mysql/plugin/file_key_management.so
|
||||
lib/mysql/plugin/ha_archive.so
|
||||
lib/mysql/plugin/ha_blackhole.so
|
||||
lib/mysql/plugin/ha_connect.so
|
||||
lib/mysql/plugin/ha_federated.so
|
||||
lib/mysql/plugin/ha_federatedx.so
|
||||
%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
|
||||
%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
|
||||
%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so
|
||||
%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
|
||||
%%SPIDER%%lib/mysql/plugin/ha_spider.so
|
||||
%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
|
||||
lib/mysql/plugin/ha_test_sql_discovery.so
|
||||
lib/mysql/plugin/handlersocket.so
|
||||
lib/mysql/plugin/locales.so
|
||||
lib/mysql/plugin/metadata_lock_info.so
|
||||
lib/mysql/plugin/pam_user_map.so
|
||||
lib/mysql/plugin/qa_auth_client.so
|
||||
lib/mysql/plugin/qa_auth_interface.so
|
||||
lib/mysql/plugin/qa_auth_server.so
|
||||
lib/mysql/plugin/query_cache_info.so
|
||||
lib/mysql/plugin/query_response_time.so
|
||||
lib/mysql/plugin/server_audit.so
|
||||
lib/mysql/plugin/simple_password_check.so
|
||||
lib/mysql/plugin/sql_errlog.so
|
||||
lib/mysql/plugin/test_versioning.so
|
||||
%%WSREP%%lib/mysql/plugin/wsrep_info.so
|
||||
libexec/mariadbd
|
||||
libexec/mysqld
|
||||
share/man/man1/aria_chk.1.gz
|
||||
share/man/man1/aria_dump_log.1.gz
|
||||
share/man/man1/aria_ftdump.1.gz
|
||||
share/man/man1/aria_pack.1.gz
|
||||
share/man/man1/aria_read_log.1.gz
|
||||
share/man/man1/galera_new_cluster.1.gz
|
||||
share/man/man1/galera_recovery.1.gz
|
||||
share/man/man1/innochecksum.1.gz
|
||||
share/man/man1/mariabackup.1.gz
|
||||
share/man/man1/mariadb-backup.1.gz
|
||||
share/man/man1/mariadb-dumpslow.1.gz
|
||||
share/man/man1/mariadb-embedded.1.gz
|
||||
share/man/man1/mariadb-fix-extensions.1.gz
|
||||
share/man/man1/mariadb-install-db.1.gz
|
||||
%%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
|
||||
share/man/man1/mariadb-secure-installation.1.gz
|
||||
@comment share/man/man1/mariadb-service-convert.1.gz
|
||||
share/man/man1/mariadb-tzinfo-to-sql.1.gz
|
||||
share/man/man1/mariadb-upgrade.1.gz
|
||||
share/man/man1/mariadbd-multi.1.gz
|
||||
share/man/man1/mariadbd-safe-helper.1.gz
|
||||
share/man/man1/mariadbd-safe.1.gz
|
||||
share/man/man1/mbstream.1.gz
|
||||
share/man/man1/my_print_defaults.1.gz
|
||||
share/man/man1/myisam_ftdump.1.gz
|
||||
share/man/man1/myisamchk.1.gz
|
||||
share/man/man1/myisamlog.1.gz
|
||||
share/man/man1/myisampack.1.gz
|
||||
share/man/man1/mysql.server.1.gz
|
||||
share/man/man1/mysql_fix_extensions.1.gz
|
||||
%%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
|
||||
share/man/man1/mysql_install_db.1.gz
|
||||
share/man/man1/mysql_secure_installation.1.gz
|
||||
share/man/man1/mysql_tzinfo_to_sql.1.gz
|
||||
share/man/man1/mysql_upgrade.1.gz
|
||||
share/man/man1/mysqld_multi.1.gz
|
||||
share/man/man1/mysqld_safe.1.gz
|
||||
share/man/man1/mysqld_safe_helper.1.gz
|
||||
share/man/man1/mysqldumpslow.1.gz
|
||||
share/man/man1/perror.1.gz
|
||||
share/man/man1/resolve_stack_dump.1.gz
|
||||
share/man/man1/resolveip.1.gz
|
||||
%%TOKUDB%%share/man/man1/tokuft_logprint.1.gz
|
||||
%%TOKUDB%%share/man/man1/tokuftdump.1.gz
|
||||
%%WSREP%%share/man/man1/wsrep_sst_common.1.gz
|
||||
%%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
|
||||
%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
|
||||
%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
|
||||
%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
|
||||
share/man/man8/mariadbd.8.gz
|
||||
share/man/man8/mysqld.8.gz
|
||||
%%DATADIR%%/binary-configure
|
||||
%%DATADIR%%/bulgarian/errmsg.sys
|
||||
%%DATADIR%%/charsets/Index.xml
|
||||
%%DATADIR%%/charsets/README
|
||||
%%DATADIR%%/charsets/armscii8.xml
|
||||
%%DATADIR%%/charsets/ascii.xml
|
||||
%%DATADIR%%/charsets/cp1250.xml
|
||||
%%DATADIR%%/charsets/cp1251.xml
|
||||
%%DATADIR%%/charsets/cp1256.xml
|
||||
%%DATADIR%%/charsets/cp1257.xml
|
||||
%%DATADIR%%/charsets/cp850.xml
|
||||
%%DATADIR%%/charsets/cp852.xml
|
||||
%%DATADIR%%/charsets/cp866.xml
|
||||
%%DATADIR%%/charsets/dec8.xml
|
||||
%%DATADIR%%/charsets/geostd8.xml
|
||||
%%DATADIR%%/charsets/greek.xml
|
||||
%%DATADIR%%/charsets/hebrew.xml
|
||||
%%DATADIR%%/charsets/hp8.xml
|
||||
%%DATADIR%%/charsets/keybcs2.xml
|
||||
%%DATADIR%%/charsets/koi8r.xml
|
||||
%%DATADIR%%/charsets/koi8u.xml
|
||||
%%DATADIR%%/charsets/latin1.xml
|
||||
%%DATADIR%%/charsets/latin2.xml
|
||||
%%DATADIR%%/charsets/latin5.xml
|
||||
%%DATADIR%%/charsets/latin7.xml
|
||||
%%DATADIR%%/charsets/macce.xml
|
||||
%%DATADIR%%/charsets/macroman.xml
|
||||
%%DATADIR%%/charsets/swe7.xml
|
||||
%%DATADIR%%/chinese/errmsg.sys
|
||||
%%DATADIR%%/czech/errmsg.sys
|
||||
%%DATADIR%%/danish/errmsg.sys
|
||||
%%DATADIR%%/dutch/errmsg.sys
|
||||
%%DATADIR%%/english/errmsg.sys
|
||||
%%DATADIR%%/errmsg-utf8.txt
|
||||
%%DATADIR%%/estonian/errmsg.sys
|
||||
%%DATADIR%%/fill_help_tables.sql
|
||||
%%DATADIR%%/french/errmsg.sys
|
||||
%%DATADIR%%/german/errmsg.sys
|
||||
%%DATADIR%%/greek/errmsg.sys
|
||||
%%DATADIR%%/hindi/errmsg.sys
|
||||
%%DATADIR%%/hungarian/errmsg.sys
|
||||
%%SPIDER%%%%DATADIR%%/install_spider.sql
|
||||
%%DATADIR%%/italian/errmsg.sys
|
||||
%%DATADIR%%/japanese/errmsg.sys
|
||||
%%DATADIR%%/korean/errmsg.sys
|
||||
%%DATADIR%%/magic
|
||||
%%DATADIR%%/maria_add_gis_sp.sql
|
||||
%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
|
||||
%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
|
||||
%%MROONGA%%%%DATADIR%%/mroonga/install.sql
|
||||
%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
|
||||
%%DATADIR%%/mysql-log-rotate
|
||||
%%DATADIR%%/mysql.server
|
||||
%%DATADIR%%/mysql_performance_tables.sql
|
||||
%%DATADIR%%/mysql_system_tables.sql
|
||||
%%DATADIR%%/mysql_system_tables_data.sql
|
||||
%%DATADIR%%/mysql_test_data_timezone.sql
|
||||
%%DATADIR%%/mysql_test_db.sql
|
||||
%%DATADIR%%/mysqld_multi.server
|
||||
%%DATADIR%%/norwegian-ny/errmsg.sys
|
||||
%%DATADIR%%/norwegian/errmsg.sys
|
||||
%%DATADIR%%/polish/errmsg.sys
|
||||
%%DATADIR%%/portuguese/errmsg.sys
|
||||
%%DATADIR%%/romanian/errmsg.sys
|
||||
%%DATADIR%%/russian/errmsg.sys
|
||||
%%DATADIR%%/serbian/errmsg.sys
|
||||
%%DATADIR%%/slovak/errmsg.sys
|
||||
%%DATADIR%%/spanish/errmsg.sys
|
||||
%%DATADIR%%/swedish/errmsg.sys
|
||||
%%DATADIR%%/ukrainian/errmsg.sys
|
||||
%%WSREP%%%%DATADIR%%/wsrep_notify
|
||||
@comment %%DOCSDIR%%/COPYING
|
||||
%%DOCSDIR%%/INSTALL-BINARY
|
||||
%%WSREP%%%%DOCSDIR%%/README-wsrep
|
||||
@comment %%DOCSDIR%%/THIRDPARTY
|
||||
@comment share/groonga-normalizer-mysql/lgpl-2.0.txt
|
||||
@comment share/groonga/COPYING
|
||||
@comment share/mysql/mroonga/COPYING
|
||||
%%MROONGA%%share/groonga-normalizer-mysql/README.md
|
||||
%%MROONGA%%share/groonga/README.md
|
||||
@comment bin/mariadb
|
||||
@comment bin/mariadb-access
|
||||
@comment bin/mariadb-admin
|
||||
@comment bin/mariadb-binlog
|
||||
@comment bin/mariadb-check
|
||||
@comment bin/mariadb-client-test
|
||||
@comment bin/mariadb-client-test-embedded
|
||||
@comment bin/mariadb-convert-table-format
|
||||
@comment bin/mariadb-dump
|
||||
@comment bin/mariadb-find-rows
|
||||
@comment bin/mariadb-hotcopy
|
||||
@comment bin/mariadb-import
|
||||
@comment bin/mariadb-plugin
|
||||
@comment bin/mariadb-setpermission
|
||||
@comment bin/mariadb-show
|
||||
@comment bin/mariadb-slap
|
||||
@comment bin/mariadb-test
|
||||
@comment bin/mariadb-test-embedded
|
||||
@comment bin/mariadb_config
|
||||
@comment bin/msql2mysql
|
||||
@comment bin/mysql
|
||||
@comment bin/mysql_config
|
||||
@comment bin/mysql_convert_table_format
|
||||
@comment bin/mysql_find_rows
|
||||
@comment bin/mysql_setpermission
|
||||
@comment bin/mysqlaccess
|
||||
@comment bin/mysqladmin
|
||||
@comment bin/mysqlbinlog
|
||||
@comment bin/mysqlcheck
|
||||
@comment bin/mysqldump
|
||||
@comment bin/mysqlhotcopy
|
||||
@comment bin/mysqlimport
|
||||
@comment bin/mysqlshow
|
||||
@comment bin/mysqlslap
|
||||
@comment bin/mysqltest
|
||||
@comment bin/mytop
|
||||
@comment bin/replace
|
||||
@comment include/mysql/errmsg.h
|
||||
@comment include/mysql/ma_list.h
|
||||
@comment include/mysql/ma_pvio.h
|
||||
@comment include/mysql/ma_tls.h
|
||||
@comment include/mysql/mariadb/ma_io.h
|
||||
@comment include/mysql/mariadb_com.h
|
||||
@comment include/mysql/mariadb_ctype.h
|
||||
@comment include/mysql/mariadb_dyncol.h
|
||||
@comment include/mysql/mariadb_rpl.h
|
||||
@comment include/mysql/mariadb_stmt.h
|
||||
@comment include/mysql/mariadb_version.h
|
||||
@comment include/mysql/my_config.h
|
||||
@comment include/mysql/my_global.h
|
||||
@comment include/mysql/my_sys.h
|
||||
@comment include/mysql/mysql.h
|
||||
@comment include/mysql/mysql/client_plugin.h
|
||||
@comment include/mysql/mysql/plugin_auth.h
|
||||
@comment include/mysql/mysql/plugin_auth_common.h
|
||||
@comment include/mysql/mysql_com.h
|
||||
@comment include/mysql/mysql_version.h
|
||||
@comment include/mysql/mysqld_error.h
|
||||
@comment lib/mysql/libmariadb.so
|
||||
@comment lib/mysql/libmariadb.so.3
|
||||
@comment lib/mysql/libmariadbclient.a
|
||||
@comment lib/mysql/libmysqlclient.a
|
||||
@comment lib/mysql/libmysqlclient.so
|
||||
@comment lib/mysql/libmysqlclient_r.a
|
||||
@comment lib/mysql/libmysqlclient_r.so
|
||||
@comment lib/mysql/plugin/auth_gssapi_client.so
|
||||
@comment lib/mysql/plugin/client_ed25519.so
|
||||
@comment lib/mysql/plugin/daemon_example.ini
|
||||
@comment lib/mysql/plugin/dialog.so
|
||||
@comment lib/mysql/plugin/mysql_clear_password.so
|
||||
@comment lib/mysql/plugin/sha256_password.so
|
||||
@comment libdata/pkgconfig/libmariadb.pc
|
||||
@comment share/man/man1/mariadb-access.1.gz
|
||||
@comment share/man/man1/mariadb-admin.1.gz
|
||||
@comment share/man/man1/mariadb-binlog.1.gz
|
||||
@comment share/man/man1/mariadb-check.1.gz
|
||||
@comment share/man/man1/mariadb-client-test-embedded.1.gz
|
||||
@comment share/man/man1/mariadb-client-test.1.gz
|
||||
@comment share/man/man1/mariadb-convert-table-format.1.gz
|
||||
@comment share/man/man1/mariadb-dump.1.gz
|
||||
@comment share/man/man1/mariadb-find-rows.1.gz
|
||||
@comment share/man/man1/mariadb-hotcopy.1.gz
|
||||
@comment share/man/man1/mariadb-import.1.gz
|
||||
@comment share/man/man1/mariadb-plugin.1.gz
|
||||
@comment share/man/man1/mariadb-service-convert.1.gz
|
||||
@comment share/man/man1/mariadb-setpermission.1.gz
|
||||
@comment share/man/man1/mariadb-show.1.gz
|
||||
@comment share/man/man1/mariadb-slap.1.gz
|
||||
@comment share/man/man1/mariadb-test-embedded.1.gz
|
||||
@comment share/man/man1/mariadb-test.1.gz
|
||||
share/man/man1/mariadb-waitpid.1.gz
|
||||
@comment share/man/man1/mariadb.1.gz
|
||||
@comment share/man/man1/msql2mysql.1.gz
|
||||
@comment share/man/man1/my_safe_process.1.gz
|
||||
@comment share/man/man1/mysql-stress-test.pl.1.gz
|
||||
@comment share/man/man1/mysql-test-run.pl.1.gz
|
||||
@comment share/man/man1/mysql.1.gz
|
||||
@comment share/man/man1/mysql_client_test.1.gz
|
||||
@comment share/man/man1/mysql_client_test_embedded.1.gz
|
||||
@comment share/man/man1/mysql_config.1.gz
|
||||
@comment share/man/man1/mysql_convert_table_format.1.gz
|
||||
@comment share/man/man1/mysql_embedded.1.gz
|
||||
@comment share/man/man1/mysql_find_rows.1.gz
|
||||
@comment share/man/man1/mysql_plugin.1.gz
|
||||
@comment share/man/man1/mysql_setpermission.1.gz
|
||||
@comment share/man/man1/mysql_waitpid.1.gz
|
||||
@comment share/man/man1/mysqlaccess.1.gz
|
||||
@comment share/man/man1/mysqladmin.1.gz
|
||||
@comment share/man/man1/mysqlbinlog.1.gz
|
||||
@comment share/man/man1/mysqlcheck.1.gz
|
||||
@comment share/man/man1/mysqldump.1.gz
|
||||
@comment share/man/man1/mysqlhotcopy.1.gz
|
||||
@comment share/man/man1/mysqlimport.1.gz
|
||||
@comment share/man/man1/mysqlshow.1.gz
|
||||
@comment share/man/man1/mysqlslap.1.gz
|
||||
@comment share/man/man1/mysqltest.1.gz
|
||||
@comment share/man/man1/mysqltest_embedded.1.gz
|
||||
@comment share/man/man1/replace.1.gz
|
||||
@comment share/pkgconfig/mariadb.pc
|
||||
@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= memcached
|
||||
PORTVERSION= 1.6.20
|
||||
PORTVERSION= 1.6.21
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= http://www.memcached.org/files/ \
|
||||
GENTOO
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1684261463
|
||||
SHA256 (memcached-1.6.20.tar.gz) = 8f604f8e3a175637dc1f069de6fa2739116850c9f81e3764f2fac9a3b27be307
|
||||
SIZE (memcached-1.6.20.tar.gz) = 2615902
|
||||
TIMESTAMP = 1688075591
|
||||
SHA256 (memcached-1.6.21.tar.gz) = c788980efc417dd5d93c442b1c8b8769fb2018896c29de3887d22a2f143da2ee
|
||||
SIZE (memcached-1.6.21.tar.gz) = 1127623
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
PORTNAME= mongodb40-tools
|
||||
DISTVERSIONPREFIX= r
|
||||
DISTVERSION= 4.0.28
|
||||
PORTREVISION= 12
|
||||
CATEGORIES= databases
|
||||
|
||||
MAINTAINER= dev.ashevchuk@gmail.com
|
||||
COMMENT= Tools for MongoDB
|
||||
WWW= https://github.com/mongodb/mongo-tools
|
||||
|
||||
LICENSE= APACHE20
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE.md
|
||||
|
||||
DEPRECATED= Upstream EOL reached on 2022-04-30
|
||||
EXPIRATION_DATE= 2023-06-30
|
||||
ONLY_FOR_ARCHS= aarch64 amd64 armv7 i386
|
||||
ONLY_FOR_ARCHS_REASON= not yet ported to other architectures
|
||||
|
||||
USES= compiler:c++14-lang go localbase
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= mongodb
|
||||
GH_PROJECT= mongo-tools
|
||||
|
||||
GO_BUILDFLAGS= -tags "${USE_MY_TAGS}"
|
||||
GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT}
|
||||
|
||||
CONFLICTS_INSTALL= mongodb36-tools mongodb42-tools mongodb-tools
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
OPTIONS_DEFAULT= MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
|
||||
MONGORESTORE SASL SSL
|
||||
OPTIONS_MULTI= SECURITY TOOLS
|
||||
OPTIONS_MULTI_TOOLS= BSONDUMP MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
|
||||
MONGOREPLAY MONGORESTORE MONGOSTAT MONGOTOP
|
||||
OPTIONS_MULTI_SECURITY= SASL SSL
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
BSONDUMP_DESC= BSON files into human-readable formats
|
||||
MONGOSTAT_DESC= Status of a running mongod or mongos instance
|
||||
MONGOFILES_DESC= Interface to GridFS in a MongoDB instance
|
||||
MONGOEXPORT_DESC= JSON or CSV export of MongoDB instance data
|
||||
MONGOIMPORT_DESC= Importing JSON, CSV, or TSV into a MongoDB instance
|
||||
MONGORESTORE_DESC= BSON data to a MongoDB instance
|
||||
MONGODUMP_DESC= BSON data from the contents of a MongoDB instance
|
||||
MONGOTOP_DESC= Track the amount of data I/O time
|
||||
MONGOREPLAY_DESC= Traffic capture and replay tool
|
||||
|
||||
BSONDUMP_VARS= go_target+=./bsondump/main:bsondump
|
||||
MONGOSTAT_VARS= go_target+=./mongostat/main:mongostat
|
||||
MONGOFILES_VARS= go_target+=./mongofiles/main:mongofiles
|
||||
MONGOEXPORT_VARS= go_target+=./mongoexport/main:mongoexport
|
||||
MONGOIMPORT_VARS= go_target+=./mongoimport/main:mongoimport
|
||||
MONGORESTORE_VARS= go_target+=./mongorestore/main:mongorestore
|
||||
MONGODUMP_VARS= go_target+=./mongodump/main:mongodump
|
||||
MONGOTOP_VARS= go_target+=./mongotop/main:mongotop
|
||||
MONGOREPLAY_VARS= go_target+=./mongoreplay/main:mongoreplay
|
||||
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
|
||||
SASL_USE= my_tags=sasl
|
||||
SSL_USES= ssl
|
||||
SSL_USE= my_tags=ssl
|
||||
|
||||
post-install-DOCS-on:
|
||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
.for doc in README.md CONTRIBUTING.md THIRD-PARTY-NOTICES
|
||||
${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
TIMESTAMP = 1643098994
|
||||
SHA256 (mongodb-mongo-tools-r4.0.28_GH0.tar.gz) = e0902f44ca49a40e522d3c2a7af2c09e40ac966b32207a92ec0800f3eb844745
|
||||
SIZE (mongodb-mongo-tools-r4.0.28_GH0.tar.gz) = 11149261
|
||||
|
|
@ -1,325 +0,0 @@
|
|||
--- common/util/file.go.orig 2018-11-21 17:52:58 UTC
|
||||
+++ common/util/file.go
|
||||
@@ -9,11 +9,68 @@
|
||||
import (
|
||||
"bufio"
|
||||
"io"
|
||||
- "net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
+ "strconv"
|
||||
)
|
||||
|
||||
+// Error reports an error and the operation and URL that caused it.
|
||||
+type Error struct {
|
||||
+ Op string
|
||||
+ URL string
|
||||
+ Err error
|
||||
+}
|
||||
+
|
||||
+func (e *Error) Error() string { return e.Op + " " + e.URL + ": " + e.Err.Error() }
|
||||
+
|
||||
+func ishex(c byte) bool {
|
||||
+ switch {
|
||||
+ case '0' <= c && c <= '9':
|
||||
+ return true
|
||||
+ case 'a' <= c && c <= 'f':
|
||||
+ return true
|
||||
+ case 'A' <= c && c <= 'F':
|
||||
+ return true
|
||||
+ }
|
||||
+ return false
|
||||
+}
|
||||
+
|
||||
+func unhex(c byte) byte {
|
||||
+ switch {
|
||||
+ case '0' <= c && c <= '9':
|
||||
+ return c - '0'
|
||||
+ case 'a' <= c && c <= 'f':
|
||||
+ return c - 'a' + 10
|
||||
+ case 'A' <= c && c <= 'F':
|
||||
+ return c - 'A' + 10
|
||||
+ }
|
||||
+ return 0
|
||||
+}
|
||||
+
|
||||
+type encoding int
|
||||
+
|
||||
+const (
|
||||
+ encodePath encoding = 1 + iota
|
||||
+ encodePathSegment
|
||||
+ encodeHost
|
||||
+ encodeZone
|
||||
+ encodeUserPassword
|
||||
+ encodeQueryComponent
|
||||
+ encodeFragment
|
||||
+)
|
||||
+
|
||||
+type EscapeError string
|
||||
+
|
||||
+func (e EscapeError) Error() string {
|
||||
+ return "invalid URL escape " + strconv.Quote(string(e))
|
||||
+}
|
||||
+
|
||||
+type InvalidHostError string
|
||||
+
|
||||
+func (e InvalidHostError) Error() string {
|
||||
+ return "invalid character " + strconv.Quote(string(e)) + " in host name"
|
||||
+}
|
||||
+
|
||||
// GetFieldsFromFile fetches the first line from the contents of the file
|
||||
// at "path"
|
||||
func GetFieldsFromFile(path string) ([]string, error) {
|
||||
@@ -42,11 +99,11 @@
|
||||
}
|
||||
|
||||
func EscapeCollectionName(collName string) string {
|
||||
- return url.PathEscape(collName)
|
||||
+ return PathEscape(collName)
|
||||
}
|
||||
|
||||
func UnescapeCollectionName(escapedCollName string) (string, error) {
|
||||
- return url.PathUnescape(escapedCollName)
|
||||
+ return PathUnescape(escapedCollName)
|
||||
}
|
||||
|
||||
type WrappedReadCloser struct {
|
||||
@@ -76,3 +133,238 @@
|
||||
}
|
||||
return innerErr
|
||||
}
|
||||
+
|
||||
+// Return true if the specified character should be escaped when
|
||||
+// appearing in a URL string, according to RFC 3986.
|
||||
+//
|
||||
+// Please be informed that for now shouldEscape does not check all
|
||||
+// reserved characters correctly. See golang.org/issue/5684.
|
||||
+func shouldEscape(c byte, mode encoding) bool {
|
||||
+ // §2.3 Unreserved characters (alphanum)
|
||||
+ if 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' {
|
||||
+ return false
|
||||
+ }
|
||||
+
|
||||
+ if mode == encodeHost || mode == encodeZone {
|
||||
+ // §3.2.2 Host allows
|
||||
+ // sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
|
||||
+ // as part of reg-name.
|
||||
+ // We add : because we include :port as part of host.
|
||||
+ // We add [ ] because we include [ipv6]:port as part of host.
|
||||
+ // We add < > because they're the only characters left that
|
||||
+ // we could possibly allow, and Parse will reject them if we
|
||||
+ // escape them (because hosts can't use %-encoding for
|
||||
+ // ASCII bytes).
|
||||
+ switch c {
|
||||
+ case '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=', ':', '[', ']', '<', '>', '"':
|
||||
+ return false
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ switch c {
|
||||
+ case '-', '_', '.', '~': // §2.3 Unreserved characters (mark)
|
||||
+ return false
|
||||
+
|
||||
+ case '$', '&', '+', ',', '/', ':', ';', '=', '?', '@': // §2.2 Reserved characters (reserved)
|
||||
+ // Different sections of the URL allow a few of
|
||||
+ // the reserved characters to appear unescaped.
|
||||
+ switch mode {
|
||||
+ case encodePath: // §3.3
|
||||
+ // The RFC allows : @ & = + $ but saves / ; , for assigning
|
||||
+ // meaning to individual path segments. This package
|
||||
+ // only manipulates the path as a whole, so we allow those
|
||||
+ // last three as well. That leaves only ? to escape.
|
||||
+ return c == '?'
|
||||
+
|
||||
+ case encodePathSegment: // §3.3
|
||||
+ // The RFC allows : @ & = + $ but saves / ; , for assigning
|
||||
+ // meaning to individual path segments.
|
||||
+ return c == '/' || c == ';' || c == ',' || c == '?'
|
||||
+
|
||||
+ case encodeUserPassword: // §3.2.1
|
||||
+ // The RFC allows ';', ':', '&', '=', '+', '$', and ',' in
|
||||
+ // userinfo, so we must escape only '@', '/', and '?'.
|
||||
+ // The parsing of userinfo treats ':' as special so we must escape
|
||||
+ // that too.
|
||||
+ return c == '@' || c == '/' || c == '?' || c == ':'
|
||||
+
|
||||
+ case encodeQueryComponent: // §3.4
|
||||
+ // The RFC reserves (so we must escape) everything.
|
||||
+ return true
|
||||
+
|
||||
+ case encodeFragment: // §4.1
|
||||
+ // The RFC text is silent but the grammar allows
|
||||
+ // everything, so escape nothing.
|
||||
+ return false
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if mode == encodeFragment {
|
||||
+ // RFC 3986 §2.2 allows not escaping sub-delims. A subset of sub-delims are
|
||||
+ // included in reserved from RFC 2396 §2.2. The remaining sub-delims do not
|
||||
+ // need to be escaped. To minimize potential breakage, we apply two restrictions:
|
||||
+ // (1) we always escape sub-delims outside of the fragment, and (2) we always
|
||||
+ // escape single quote to avoid breaking callers that had previously assumed that
|
||||
+ // single quotes would be escaped. See issue #19917.
|
||||
+ switch c {
|
||||
+ case '!', '(', ')', '*':
|
||||
+ return false
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // Everything else must be escaped.
|
||||
+ return true
|
||||
+}
|
||||
+
|
||||
+// PathUnescape does the inverse transformation of PathEscape,
|
||||
+// converting each 3-byte encoded substring of the form "%AB" into the
|
||||
+// hex-decoded byte 0xAB. It returns an error if any % is not followed
|
||||
+// by two hexadecimal digits.
|
||||
+//
|
||||
+// PathUnescape is identical to QueryUnescape except that it does not
|
||||
+// unescape '+' to ' ' (space).
|
||||
+func PathUnescape(s string) (string, error) {
|
||||
+ return unescape(s, encodePathSegment)
|
||||
+}
|
||||
+
|
||||
+// unescape unescapes a string; the mode specifies
|
||||
+// which section of the URL string is being unescaped.
|
||||
+func unescape(s string, mode encoding) (string, error) {
|
||||
+ // Count %, check that they're well-formed.
|
||||
+ n := 0
|
||||
+ hasPlus := false
|
||||
+ for i := 0; i < len(s); {
|
||||
+ switch s[i] {
|
||||
+ case '%':
|
||||
+ n++
|
||||
+ if i+2 >= len(s) || !ishex(s[i+1]) || !ishex(s[i+2]) {
|
||||
+ s = s[i:]
|
||||
+ if len(s) > 3 {
|
||||
+ s = s[:3]
|
||||
+ }
|
||||
+ return "", EscapeError(s)
|
||||
+ }
|
||||
+ // Per https://tools.ietf.org/html/rfc3986#page-21
|
||||
+ // in the host component %-encoding can only be used
|
||||
+ // for non-ASCII bytes.
|
||||
+ // But https://tools.ietf.org/html/rfc6874#section-2
|
||||
+ // introduces %25 being allowed to escape a percent sign
|
||||
+ // in IPv6 scoped-address literals. Yay.
|
||||
+ if mode == encodeHost && unhex(s[i+1]) < 8 && s[i:i+3] != "%25" {
|
||||
+ return "", EscapeError(s[i : i+3])
|
||||
+ }
|
||||
+ if mode == encodeZone {
|
||||
+ // RFC 6874 says basically "anything goes" for zone identifiers
|
||||
+ // and that even non-ASCII can be redundantly escaped,
|
||||
+ // but it seems prudent to restrict %-escaped bytes here to those
|
||||
+ // that are valid host name bytes in their unescaped form.
|
||||
+ // That is, you can use escaping in the zone identifier but not
|
||||
+ // to introduce bytes you couldn't just write directly.
|
||||
+ // But Windows puts spaces here! Yay.
|
||||
+ v := unhex(s[i+1])<<4 | unhex(s[i+2])
|
||||
+ if s[i:i+3] != "%25" && v != ' ' && shouldEscape(v, encodeHost) {
|
||||
+ return "", EscapeError(s[i : i+3])
|
||||
+ }
|
||||
+ }
|
||||
+ i += 3
|
||||
+ case '+':
|
||||
+ hasPlus = mode == encodeQueryComponent
|
||||
+ i++
|
||||
+ default:
|
||||
+ if (mode == encodeHost || mode == encodeZone) && s[i] < 0x80 && shouldEscape(s[i], mode) {
|
||||
+ return "", InvalidHostError(s[i : i+1])
|
||||
+ }
|
||||
+ i++
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if n == 0 && !hasPlus {
|
||||
+ return s, nil
|
||||
+ }
|
||||
+
|
||||
+ t := make([]byte, len(s)-2*n)
|
||||
+ j := 0
|
||||
+ for i := 0; i < len(s); {
|
||||
+ switch s[i] {
|
||||
+ case '%':
|
||||
+ t[j] = unhex(s[i+1])<<4 | unhex(s[i+2])
|
||||
+ j++
|
||||
+ i += 3
|
||||
+ case '+':
|
||||
+ if mode == encodeQueryComponent {
|
||||
+ t[j] = ' '
|
||||
+ } else {
|
||||
+ t[j] = '+'
|
||||
+ }
|
||||
+ j++
|
||||
+ i++
|
||||
+ default:
|
||||
+ t[j] = s[i]
|
||||
+ j++
|
||||
+ i++
|
||||
+ }
|
||||
+ }
|
||||
+ return string(t), nil
|
||||
+}
|
||||
+
|
||||
+// PathEscape escapes the string so it can be safely placed
|
||||
+// inside a URL path segment.
|
||||
+func PathEscape(s string) string {
|
||||
+ return escape(s, encodePathSegment)
|
||||
+}
|
||||
+
|
||||
+func escape(s string, mode encoding) string {
|
||||
+ spaceCount, hexCount := 0, 0
|
||||
+ for i := 0; i < len(s); i++ {
|
||||
+ c := s[i]
|
||||
+ if shouldEscape(c, mode) {
|
||||
+ if c == ' ' && mode == encodeQueryComponent {
|
||||
+ spaceCount++
|
||||
+ } else {
|
||||
+ hexCount++
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if spaceCount == 0 && hexCount == 0 {
|
||||
+ return s
|
||||
+ }
|
||||
+
|
||||
+ var buf [64]byte
|
||||
+ var t []byte
|
||||
+
|
||||
+ required := len(s) + 2*hexCount
|
||||
+ if required <= len(buf) {
|
||||
+ t = buf[:required]
|
||||
+ } else {
|
||||
+ t = make([]byte, required)
|
||||
+ }
|
||||
+
|
||||
+ if hexCount == 0 {
|
||||
+ copy(t, s)
|
||||
+ for i := 0; i < len(s); i++ {
|
||||
+ if s[i] == ' ' {
|
||||
+ t[i] = '+'
|
||||
+ }
|
||||
+ }
|
||||
+ return string(t)
|
||||
+ }
|
||||
+
|
||||
+ j := 0
|
||||
+ for i := 0; i < len(s); i++ {
|
||||
+ switch c := s[i]; {
|
||||
+ case c == ' ' && mode == encodeQueryComponent:
|
||||
+ t[j] = '+'
|
||||
+ j++
|
||||
+ case shouldEscape(c, mode):
|
||||
+ t[j] = '%'
|
||||
+ t[j+1] = "0123456789ABCDEF"[c>>4]
|
||||
+ t[j+2] = "0123456789ABCDEF"[c&15]
|
||||
+ j += 3
|
||||
+ default:
|
||||
+ t[j] = s[i]
|
||||
+ j++
|
||||
+ }
|
||||
+ }
|
||||
+ return string(t)
|
||||
+}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
--- vendor/github.com/10gen/openssl/build.go.orig 2018-11-21 19:00:22 UTC
|
||||
+++ vendor/github.com/10gen/openssl/build.go
|
||||
@@ -20,5 +20,6 @@
|
||||
// #cgo CFLAGS: -Wno-deprecated-declarations
|
||||
// #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN -I"c:/openssl/include"
|
||||
// #cgo windows LDFLAGS: -lssleay32 -llibeay32 -lcrypt32 -L "c:/openssl/bin"
|
||||
+// #cgo freebsd LDFLAGS: -lssl -lcrypto
|
||||
// #cgo darwin LDFLAGS: -framework CoreFoundation -framework Foundation -framework Security
|
||||
import "C"
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- vendor/github.com/10gen/openssl/init_posix.go.orig 2018-11-21 17:52:58 UTC
|
||||
+++ vendor/github.com/10gen/openssl/init_posix.go
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
-// +build linux darwin cgo
|
||||
+// +build linux darwin freebsd cgo
|
||||
// +build !windows
|
||||
|
||||
package openssl
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
Useful utilities for managing a MongoDB instance written in Go.
|
||||
|
||||
- bsondump - display BSON files in a human-readable format
|
||||
- mongoimport - Convert data from JSON, TSV or CSV and insert them
|
||||
into a collection
|
||||
- mongoexport - Write an existing collection to CSV or JSON format
|
||||
- mongodump/mongorestore - Dump MongoDB backups to disk in .BSON
|
||||
format, or restore them to a live database
|
||||
- mongostat - Monitor live MongoDB servers, replica sets, or sharded
|
||||
clusters
|
||||
- mongofiles - Read, write, delete, or update files in GridFS
|
||||
- mongotop - Monitor read/write activity on a mongo server
|
||||
- mongoreplay - Capture, observe, and replay traffic for MongoDB
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
%%BSONDUMP%%bin/bsondump
|
||||
%%MONGODUMP%%bin/mongodump
|
||||
%%MONGOEXPORT%%bin/mongoexport
|
||||
%%MONGOFILES%%bin/mongofiles
|
||||
%%MONGOIMPORT%%bin/mongoimport
|
||||
%%MONGORESTORE%%bin/mongorestore
|
||||
%%MONGOREPLAY%%bin/mongoreplay
|
||||
%%MONGOSTAT%%bin/mongostat
|
||||
%%MONGOTOP%%bin/mongotop
|
||||
%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README.md
|
||||
%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES
|
||||
|
|
@ -1,82 +0,0 @@
|
|||
PORTNAME= mongodb
|
||||
DISTVERSIONPREFIX= r
|
||||
DISTVERSION= 4.0.28
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases net
|
||||
MASTER_SITES= https://fastdl.mongodb.org/src/ \
|
||||
http://fastdl.mongodb.org/src/
|
||||
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
|
||||
DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
|
||||
|
||||
MAINTAINER= dev.ashevchuk@gmail.com
|
||||
COMMENT= Distributed document-oriented "NoSQL" database (4.0.x Branch)
|
||||
WWW= https://docs.mongodb.com/v4.0/
|
||||
|
||||
LICENSE= SSPLv1 APACHE20
|
||||
LICENSE_COMB= multi
|
||||
LICENSE_NAME_SSPLv1= Server Side Public License Version 1
|
||||
LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE-Community.txt
|
||||
LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
|
||||
|
||||
DEPRECATED= Upstream EOL reached on 2022-04-30
|
||||
EXPIRATION_DATE= 2023-06-30
|
||||
ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le
|
||||
ONLY_FOR_ARCHS_REASON= only supported on amd64, aarch64, and powerpc64le; i386 deprecated in v3
|
||||
|
||||
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
|
||||
${LOCALBASE}/bin/ar:devel/binutils
|
||||
LIB_DEPENDS= libpcre.so:devel/pcre \
|
||||
libcurl.so:ftp/curl \
|
||||
libsnappy.so:archivers/snappy
|
||||
|
||||
USES= compiler:c++14-lang cpe python:build scons shebangfix
|
||||
USE_RC_SUBR= mongod
|
||||
|
||||
CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample
|
||||
|
||||
SHEBANG_FILES= src/mongo/installer/compass/install_compass
|
||||
python_OLD_CMD= @python_interpreter@
|
||||
|
||||
MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
|
||||
--use-system-pcre --use-system-snappy \
|
||||
--use-system-zlib \
|
||||
--cxx-std=14 --libc++ \
|
||||
--runtime-hardening=on \
|
||||
--disable-warnings-as-errors \
|
||||
VERBOSE=on AR=${PREFIX}/bin/ar
|
||||
|
||||
USERS= mongodb
|
||||
GROUPS= mongodb
|
||||
|
||||
OPTIONS_DEFINE= SASL SSL
|
||||
OPTIONS_DEFAULT= SASL SSL
|
||||
|
||||
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
|
||||
SASL_MAKE_ARGS= --use-sasl-client
|
||||
|
||||
SSL_USES= ssl
|
||||
SSL_MAKE_ARGS= --ssl
|
||||
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
|
||||
EXTRA_PATCHES= ${FILESDIR}/${ARCH}
|
||||
.endif
|
||||
|
||||
ALL_TARGET= core
|
||||
|
||||
PORTSCOUT= limitw:1,even
|
||||
|
||||
CPE_PRODUCT= mongodb
|
||||
|
||||
pre-patch:
|
||||
${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S
|
||||
|
||||
post-install:
|
||||
.for f in mongo mongod mongos
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
|
||||
.endfor
|
||||
${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
TIMESTAMP = 1643098927
|
||||
SHA256 (mongodb-src-r4.0.28.tar.gz) = 2c7baec90f57bb46c3e74c9a0f34a355388758c80de92702629ebac05c895dcf
|
||||
SIZE (mongodb-src-r4.0.28.tar.gz) = 50524484
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "asmjs/AsmJSFrameIterator.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "asmjs/AsmJSFrameIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "asmjs/AsmJSFrameIterator.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "asmjs/AsmJSLink.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "asmjs/AsmJSLink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "asmjs/AsmJSLink.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "asmjs/AsmJSModule.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "asmjs/AsmJSModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "asmjs/AsmJSModule.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "asmjs/AsmJSSignalHandlers.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "asmjs/AsmJSSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "asmjs/AsmJSSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "asmjs/AsmJSValidate.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "asmjs/AsmJSValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "asmjs/AsmJSValidate.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "asmjs/WasmGenerator.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "asmjs/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "asmjs/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "asmjs/WasmIonCompile.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "asmjs/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "asmjs/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "asmjs/WasmStubs.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "asmjs/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "asmjs/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/AtomicsObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/Eval.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/Intl.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/Intl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/Intl.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/MapObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/BaselineFrameInfo.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/BaselineIC.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/BaselineInspector.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/BaselineJIT.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/BitSet.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/BytecodeAnalysis.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/C1Spewer.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/CodeGenerator.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/CompileWrappers.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/Disassembler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/EagerSimdUnbox.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/EdgeCaseAnalysis.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/EffectiveAddressAnalysis.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/ExecutableAllocator.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/InstructionReordering.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/Ion.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/IonAnalysis.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/IonBuilder.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/IonCaches.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/IonCaches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/IonCaches.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/IonOptimizationLevels.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/JSONSpewer.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/JitFrames.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/JitOptions.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/JitSpewer.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/JitcodeMap.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/LICM.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/LIR.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/LoopUnroller.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/Lowering.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/MCallOptimize.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/MIR.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/MIRGraph.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/MacroAssembler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/MoveResolver.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/OptimizationTracking.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/PerfSpewer.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/ProcessExecutableMemory.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/RangeAnalysis.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/Recover.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/RegisterAllocator.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/RematerializedFrame.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/Safepoints.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/ScalarReplacement.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/SharedIC.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/Sink.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/Snapshots.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/StupidAllocator.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/TypePolicy.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/TypedObjectPrediction.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/VMFunctions.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/ValueNumbering.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/none/Trampoline-none.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/none/Trampoline-none.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/none/Trampoline-none.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/shared/BaselineCompiler-shared.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/shared/BaselineCompiler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jit/shared/CodeGenerator-shared.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jit/shared/Lowering-shared.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsalloc.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsalloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsalloc.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsapi.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsbool.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jscntxt.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jscntxt.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jscntxt.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jscompartment.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jscompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jscompartment.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "builtin/ModuleObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/Object.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/Profilers.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/Reflect.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/ReflectParse.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/SIMD.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jsdate.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsdtoa.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsdtoa.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsdtoa.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsexn.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsfriendapi.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsfun.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsfun.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsfun.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsgc.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsgc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsgc.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jsiter.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsiter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsiter.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsnativestack.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsnativestack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsnativestack.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsnum.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsobj.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsobj.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsobj.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "json.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "json.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "json.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsopcode.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsopcode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsopcode.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "jsprf.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsprf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsprf.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jspropertytree.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jspropertytree.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jspropertytree.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsscript.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsscript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsscript.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsstr.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsstr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsstr.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jswatchpoint.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jswatchpoint.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jswatchpoint.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "jsweakmap.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "jsweakmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "jsweakmap.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "perf/jsperf.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/BaseProxyHandler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/CrossCompartmentWrapper.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/DeadObjectProxy.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/DirectProxyHandler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/DirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/DirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/OpaqueCrossCompartmentWrapper.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "proxy/Proxy.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/ScriptedDirectProxyHandler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/ScriptedDirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/ScriptedDirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/ScriptedIndirectProxyHandler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/ScriptedIndirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/ScriptedIndirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/SecurityWrapper.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "proxy/Wrapper.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/ArgumentsObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/ArrayBufferObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/CallNonGenericMethod.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/CharacterEncoding.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/CodeCoverage.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Compression.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/DateTime.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/Debugger.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/DebuggerMemory.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/ErrorObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/ForOfIterator.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/GeneratorObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/GlobalObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/HelperThreads.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Id.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Interpreter.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Interpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Interpreter.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/JSONParser.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/MemoryMetrics.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Monitor.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Monitor.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Monitor.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/NativeObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/ObjectGroup.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/PIC.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/PosixNSPR.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/PosixNSPR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/PosixNSPR.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Printer.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Probes.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/ProxyObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/ReceiverGuard.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/RegExpObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/RegExpStatics.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Runtime.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/SPSProfiler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/SPSProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/SPSProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "builtin/SymbolObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/SymbolObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/SymbolObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/TestingFunctions.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/TypedObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/WeakMapObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "builtin/WeakSetObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "devtools/sharkctl.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/SavedStacks.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/ScopeObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/ScopeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/ScopeObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/SelfHosting.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Shape.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/SharedArrayObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Stack.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/Stopwatch.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/String.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/String.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/StringBuffer.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/StructuredClone.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Symbol.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Symbol.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/TaggedProto.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp.orig 2019-01-18 22:48:17 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/Time.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/TypeInference.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/TypedArrayObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/UbiNode.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/UbiNodeCensus.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/UnboxedObject.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp.orig 2019-01-18 22:48:18 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp
|
||||
@@ -0,0 +1,37 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "vm/Unicode.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Unicode.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Value.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/WeakMapPtr.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "vm/Xdr.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp.orig 2019-01-18 22:48:18 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "ds/LifoAlloc.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "frontend/BytecodeCompiler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "frontend/BytecodeEmitter.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "frontend/FoldConstants.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "frontend/NameFunctions.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "frontend/ParseMaps.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "frontend/ParseMaps.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "frontend/ParseMaps.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp.orig 2019-01-18 22:48:18 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "frontend/ParseNode.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "frontend/TokenStream.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/Allocator.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/Barrier.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/GCTrace.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/Iteration.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp.orig 2019-01-18 22:48:18 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "gc/Marking.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/Memory.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/MemoryProfiler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/MemoryProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/MemoryProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/Nursery.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/RootMarking.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/Statistics.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
--- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp.orig 2019-01-18 22:48:18 UTC
|
||||
+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp
|
||||
@@ -0,0 +1,55 @@
|
||||
+#define MOZ_UNIFIED_BUILD
|
||||
+#include "gc/Tracer.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/Verifier.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "gc/Zone.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "irregexp/NativeRegExpMacroAssembler.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "irregexp/NativeRegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "irregexp/RegExpAST.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
+#include "irregexp/RegExpEngine.cpp"
|
||||
+#ifdef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
|
||||
+#undef PL_ARENA_CONST_ALIGN_MASK
|
||||
+#endif
|
||||
+#ifdef INITGUID
|
||||
+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in unified mode."
|
||||
+#undef INITGUID
|
||||
+#endif
|
||||
\ No newline at end of file
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue