summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Marquess <marquess@openssl.com>2016-02-15 10:26:20 -0500
committerSteve Marquess <marquess@openssl.com>2016-02-15 10:26:20 -0500
commit1278ce48a5c6afa1429b8e8cfd0f07ab0fc640bb (patch)
treecfad0b19d9dda1a4d98c40c53a045914e1217209
parenta0f8d282d728a3584f08ecb5f8321c37bb06dd28 (diff)
Add target for i686 cross compilationOpenSSL-fips-2_0_12
Reviewed-by: Stephen Henson <steve@openssl.org>
-rwxr-xr-xConfigure1
-rwxr-xr-xconfig5
2 files changed, 6 insertions, 0 deletions
diff --git a/Configure b/Configure
index 5f3d0cd785..a89fc9a367 100755
--- a/Configure
+++ b/Configure
@@ -358,6 +358,7 @@ my %table=(
"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
"linux-x86_64-cross", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DFIPS_REF_POINT_IS_CROSS_COMPILER_AWARE::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux-i686-cross", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DFIPS_REF_POINT_IS_CROSS_COMPILER_AWARE::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux64-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
#### So called "highgprs" target for z/Architecture CPUs
# "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
diff --git a/config b/config
index 9d0383e611..7bfc12a211 100755
--- a/config
+++ b/config
@@ -166,6 +166,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
echo "mips4-sgi-irix64"; exit 0
;;
+ Linux:*:cross:i686)
+ echo "${MACHINE}-cross-linux"; exit 0
+ ;;
+
Linux:[2-9].*:cross:x86_64)
echo "${MACHINE}-cross-linux"; exit 0
;;
@@ -697,6 +701,7 @@ case "$GUESSOS" in
fi ;;
*-*-linux1) OUT="linux-aout" ;;
*-*-linux2) OUT="linux-generic32" ;;
+ i686-cross-linux) OUT="linux-i686-cross" ;;
*-cross-linux) OUT="linux-x86_64-cross" ;;
sun4[uv]*-*-solaris2)
OUT="solaris-sparcv9-$CC"
} span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
{
	"name": "contacts",
	"description": "A contacts app for Nextcloud. Easily sync contacts from various devices, share and edit them online.",
	"version": "4.0.0-rc.0",
	"author": "John Molakvoæ <skjnldsv@protonmail.com>",
	"contributors": [
		"John Molakvoæ <skjnldsv@protonmail.com>",
		"Team Popcorn <teampopcornberlin@gmail.com>"
	],
	"keywords": [
		"nextcloud",
		"contacts",
		"vcard",
		"carddav"
	],
	"bugs": {
		"url": "https://github.com/nextcloud/contacts/issues"
	},
	"repository": {
		"url": "https://github.com/nextcloud/contacts",
		"type": "git"
	},
	"homepage": "https://github.com/nextcloud/contacts",
	"license": "agpl",
	"private": true,
	"scripts": {
		"build": "NODE_ENV=production webpack --progress --config webpack.js",
		"dev": "NODE_ENV=development webpack --progress --config webpack.js",
		"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
		"lint": "eslint --ext .js,.vue src",
		"lint:fix": "eslint --ext .js,.vue src --fix",
		"stylelint": "stylelint src",
		"stylelint:fix": "stylelint src --fix"
	},
	"dependencies": {
		"@mattkrick/sanitize-svg": "^0.3.1",
		"@nextcloud/auth": "^1.3.0",
		"@nextcloud/axios": "^1.6.0",
		"@nextcloud/capabilities": "^1.0.4",
		"@nextcloud/dialogs": "^3.1.2",
		"@nextcloud/event-bus": "^2.0.0",
		"@nextcloud/initial-state": "^1.2.0",
		"@nextcloud/l10n": "^1.4.1",
		"@nextcloud/logger": "^2.0.0",
		"@nextcloud/moment": "^1.1.1",
		"@nextcloud/paths": "^2.0.0",
		"@nextcloud/router": "^2.0.0",
		"@nextcloud/vue": "^4.0.3",
		"b64-to-blob": "^1.2.19",
		"camelcase": "^6.2.0",
		"cdav-library": "git+https://github.com/nextcloud/cdav-library.git",
		"debounce": "^1.2.1",
		"downloadjs": "^1.4.7",
		"ical.js": "^1.4.0",
		"moment": "^2.29.1",
		"p-limit": "^3.1.0",
		"p-queue": "^6.6.2",
		"qr-image": "^3.2.0",
		"string-natural-compare": "^3.0.1",
		"uuid": "^8.3.2",
		"vue": "^2.6.14",
		"vue-click-outside": "^1.1.0",
		"vue-clipboard2": "^0.3.1",
		"vue-masonry": "^0.13.0",
		"vue-material-design-icons": "^4.12.1",
		"vue-router": "^3.5.2",
		"vue-virtual-scroll-list": "^2.3.2",
		"vue-virtual-scroller": "^1.0.10",
		"vuex": "^3.6.2",
		"vuex-router-sync": "^5.0.0"
	},
	"engines": {
		"node": ">=14.0.0",
		"npm": ">=7.0.0"
	},
	"devDependencies": {
		"@nextcloud/babel-config": "^1.0.0-beta.1",
		"@nextcloud/browserslist-config": "^2.1.0",
		"@nextcloud/eslint-config": "^5.1.0",
		"@nextcloud/stylelint-config": "^1.0.0-beta.0",
		"@nextcloud/typings": "^1.2.0",
		"@nextcloud/webpack-vue-config": "^4.0.3",
		"@typescript-eslint/parser": "^4.28.1",
		"eslint-import-resolver-typescript": "^2.4.0",
		"ts-loader": "^9.2.3",
		"typescript": "^4.3.5"
	},
	"browserslist": [
		"extends @nextcloud/browserslist-config"
	]
}