Last Comment Bug 763987 - Normalize autoconf.mk.in
: Normalize autoconf.mk.in
Status: RESOLVED FIXED
:
Product: Core
Classification: Components
Component: Build Config (show other bugs)
: unspecified
: All All
: -- normal (vote)
: mozilla16
Assigned To: Mike Hommey [:glandium]
:
: Gregory Szorc [:gps]
Mentors:
Depends on: 764046 771870 773152
Blocks: 742795 767006
  Show dependency treegraph
 
Reported: 2012-06-12 09:12 PDT by Mike Hommey [:glandium]
Modified: 2012-07-11 22:30 PDT (History)
3 users (show)
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---
Has Regression Range: ---
Has STR: ---


Attachments
Normalize autoconf.mk.in (41.22 KB, patch)
2012-06-12 09:17 PDT, Mike Hommey [:glandium]
no flags Details | Diff | Splinter Review
Normalize autoconf.mk.in (49.27 KB, patch)
2012-06-12 23:19 PDT, Mike Hommey [:glandium]
no flags Details | Diff | Splinter Review
Normalize autoconf.mk.in (56.25 KB, patch)
2012-06-13 00:02 PDT, Mike Hommey [:glandium]
no flags Details | Diff | Splinter Review
Normalize autoconf.mk.in (58.91 KB, patch)
2012-06-13 01:48 PDT, Mike Hommey [:glandium]
ted: review+
Details | Diff | Splinter Review
Fixup (6.92 KB, patch)
2012-06-20 04:15 PDT, Mike Hommey [:glandium]
ted: review+
Details | Diff | Splinter Review

Description Mike Hommey [:glandium] 2012-06-12 09:12:05 PDT
There are various things in autoconf.mk.in that make it not very easily autogenerated:
- ifdefs
- variable definitions involving over variables (FOO = $(BAR) @FOO@)
- variable name mismatch (FOO = @BAR@)
Comment 1 Mike Hommey [:glandium] 2012-06-12 09:17:26 PDT
Created attachment 632286 [details] [diff] [review]
Normalize autoconf.mk.in

This addresses most of comment 0. The remaining lines need to move to a separate file that autoconf.mk would include, because they need to be included first (config/config.mk is included too late). That will be done in a separate patch.

Testing on try:
https://tbpl.mozilla.org/?tree=Try&rev=41178e9555c6
Comment 2 Mike Hommey [:glandium] 2012-06-12 09:40:20 PDT
Comment on attachment 632286 [details] [diff] [review]
Normalize autoconf.mk.in

Breaks b2g :(
Comment 3 Mike Hommey [:glandium] 2012-06-12 23:19:08 PDT
Created attachment 632563 [details] [diff] [review]
Normalize autoconf.mk.in

After all, I folded what I intended to be two patches. This is going through try:

https://tbpl.mozilla.org/?tree=Try&rev=abe247d8ba81

The previous B2G breakage was due to bug 764046, so this patch depends on that bug.
Comment 4 Mike Hommey [:glandium] 2012-06-13 00:02:55 PDT
Created attachment 632581 [details] [diff] [review]
Normalize autoconf.mk.in

Last one failed mac universal build.

https://tbpl.mozilla.org/?tree=Try&rev=ebb5a7ce747e
Comment 5 Mike Hommey [:glandium] 2012-06-13 01:48:36 PDT
Created attachment 632601 [details] [diff] [review]
Normalize autoconf.mk.in

Forgot to change a few SYSTEM_MAKEDEPEND.
Comment 6 Ted Mielczarek [:ted.mielczarek] 2012-06-18 12:34:09 PDT
Comment on attachment 632601 [details] [diff] [review]
Normalize autoconf.mk.in

Review of attachment 632601 [details] [diff] [review]:
-----------------------------------------------------------------

::: build/macosx/js-icc-flight.mk
@@ -1,1 @@
>  # This Source Code Form is subject to the terms of the Mozilla Public

You could just hg rm this file honestly. It's never going to be used.

::: config/baseconfig.mk
@@ +2,5 @@
> +
> +includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> +idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> +installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)

Do you want to just format these variables in configure instead?

::: config/config.mk
@@ +55,5 @@
>  space :=$(nullstr) # EOL
>  
>  core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
>  
> +RM = rm -f

I don't think this is actually necessary, since both gmake and pymake define this.

::: configure.in
@@ +4193,5 @@
>  else
> +    AC_CHECK_LIB(png, png_get_valid, [MOZ_NATIVE_PNG=1 MOZ_PNG_LIBS="-lpng"],
> +                 AC_MSG_ERROR([--with-system-png requested but no working libpng found]))
> +#    AC_CHECK_LIB(png, png_get_acTL, ,
> +#                 AC_MSG_ERROR([--with-system-png won't work because the system's libpng doesn't have APNG support]))

I would guess you don't actually want to leave this commented out. (Just for testing?)
Comment 7 Mike Hommey [:glandium] 2012-06-19 23:57:11 PDT
(In reply to Ted Mielczarek [:ted] from comment #6)
> ::: config/baseconfig.mk
> @@ +2,5 @@
> > +
> > +includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> > +idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> > +installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
> > +sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
> 
> Do you want to just format these variables in configure instead?

I'm not sure. Let's do that in a followup if that's worthwhile.
 
> ::: configure.in
> @@ +4193,5 @@
> >  else
> > +    AC_CHECK_LIB(png, png_get_valid, [MOZ_NATIVE_PNG=1 MOZ_PNG_LIBS="-lpng"],
> > +                 AC_MSG_ERROR([--with-system-png requested but no working libpng found]))
> > +#    AC_CHECK_LIB(png, png_get_acTL, ,
> > +#                 AC_MSG_ERROR([--with-system-png won't work because the system's libpng doesn't have APNG support]))
> 
> I would guess you don't actually want to leave this commented out. (Just for
> testing?)

Oops :)
Comment 9 Mike Hommey [:glandium] 2012-06-20 00:25:57 PDT
Fixup:
https://hg.mozilla.org/integration/mozilla-inbound/rev/25b914405558
Comment 10 Mike Hommey [:glandium] 2012-06-20 02:00:54 PDT
Backed out
https://hg.mozilla.org/integration/mozilla-inbound/rev/e96cc844629d
Comment 11 Mike Hommey [:glandium] 2012-06-20 04:15:39 PDT
Created attachment 634842 [details] [diff] [review]
Fixup

This should fix the jsreftest bustage I got when landing.
Comment 13 Mike Hommey [:glandium] 2012-06-20 23:02:48 PDT
https://hg.mozilla.org/mozilla-central/rev/e96cc844629d
Comment 14 Mike Hommey [:glandium] 2012-06-20 23:05:51 PDT
Folded both patches when landing:
https://hg.mozilla.org/integration/mozilla-inbound/rev/5409a2426f99
Comment 15 Ed Morley [:emorley] 2012-06-21 04:02:41 PDT
https://hg.mozilla.org/mozilla-central/rev/5409a2426f99
Comment 16 Mike Hommey [:glandium] 2012-06-21 05:57:28 PDT
Fixup to make pymake happy:
https://hg.mozilla.org/integration/mozilla-inbound/rev/9349fc366071
Comment 17 Ed Morley [:emorley] 2012-06-21 13:03:57 PDT
https://hg.mozilla.org/mozilla-central/rev/9349fc366071

Note You need to log in before you can comment on or make changes to this bug.