Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistant naming of variables #27

Open
sjorge opened this issue Jul 26, 2013 · 2 comments
Open

Consistant naming of variables #27

sjorge opened this issue Jul 26, 2013 · 2 comments

Comments

@sjorge
Copy link

sjorge commented Jul 26, 2013

Hey All,

Variable naming is not very consistant.
ISAPART and ISAPART64 vs LDFLAGS32 and LDFLAGS64. vs CONFIGURE_OPTS_32 and CONFIGURE_OPTS_64.

  1. setting ISAPART32 and setting ISAPART=${ISAPART32} for compatiblity
  2. not sure how to deal with the others.

I guess If you agree this is an issue I could look into doing a PR atleast for 1. But not 100% sure how that works.

@esproul
Copy link
Member

esproul commented Jul 29, 2013

For things like LDFLAGS, CFLAGS, CONFIGURE_OPTS and a few others, there are actually three settings-- the base name is used for both 32- and 64-bit builds, with the suffixed 32/64 versions used only in their respective builds.

As for ISAPART, it's mainly due to the organic nature of how our build system evolved. Your solution works if it really bothers you. If you want to send a PR, please make it against the template branch so that those cloning for their own use will have the benefit.

@sjorge
Copy link
Author

sjorge commented Jul 29, 2013

Seems I cannot fork it again since I already forked -_-
Here is a simple match for config.sh, I left CONFIGURE_OPTS_XX alone because, well messing with that would be a pain.

diff -rupN a/config.sh b/config.sh
--- a/config.sh 2013-07-29 22:56:16.000000000 +0200
+++ b/config.sh 2013-07-29 22:57:07.000000000 +0200
@@ -123,8 +123,10 @@ DONT_REMOVE_INSTALL_DIR=
 # These variables will be passed to the build to construct multi-arch 
 # binary and lib directories in DESTDIR

-ISAPART=i386
+ISAPART32=i386
 ISAPART64=amd64
+# for compatibility with older builds
+ISAPART=$ISAPART32

 # For OmniOS we (almost) always want GCC
 CC=gcc

It should not break any existing build configs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants