Opened 10 years ago

Closed 10 years ago

Last modified 8 years ago

#2305 closed defect (fixed)

automake 1.6.3 leaves src/common/OpenBSD_malloc_Linux.c out of tarball

Reported by: arma Owned by: erinn
Priority: Medium Milestone: Tor: 0.2.2.x-final
Component: Core Tor/Tor Version:
Severity: Keywords:
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

# Makefile.in generated by automake 1.10.1 from Makefile.am.
[...]
libor_a_LIBADD =
am__libor_a_SOURCES_DIST = address.c log.c util.c compat.c container.c \
        mempool.c memarea.c OpenBSD_malloc_Linux.c
#am__objects_1 =  \
#       OpenBSD_malloc_Linux.$(OBJEXT)

compare to

# Makefile.in generated by automake 1.6.3 from Makefile.am.
[...]
libor_a_LIBADD =
#am__objects_1 = OpenBSD_malloc_Linux.$(OBJEXT)
am__objects_1 =

Is the different version really what makes the difference?

Should we make our 'make dist' more robust to what automake version you pick?

Child Tickets

Change History (8)

comment:1 Changed 10 years ago by Sebastian

I'm moving this to Tor client so nick will see it. I believe the answer is "yes, we want to make sure this doesn't happen with an old version of automake", but I'm not sure why it would've happened this way (I'm not sure why the newer version would include OpenBSD_malloc_Linux.c).

While we look into this, I bet the same thing can/will happen with the eventdns* files once The Tarball Maker has a libevent 2.

comment:2 Changed 10 years ago by Sebastian

Component: Tor bundles/installationTor Client

comment:3 Changed 10 years ago by nickm

Milestone: Tor: 0.2.2.x-final

comment:4 Changed 10 years ago by nickm

IMO we should just disallow the broken automakes; it seems much easier than trying to figure out what about our approach to conditional compilation plays badly with 1.6.

Right now, AUTOMAKE_OPTIONS in Makefile.am says we support 1.6 and later. A quick check shows that 1.7 is the first one that distributes OpenBSD_malloc.c correctly, and the first one that doesn't give us all those warnings about --datarootdir. I say we just update Makefile.am to say that we require 1.7 or later.

comment:5 Changed 10 years ago by Sebastian

Sounds like a fine plan to me.

comment:6 Changed 10 years ago by arma

Works for me

comment:7 Changed 10 years ago by nickm

Resolution: fixed
Status: newclosed

implemented; closing.

comment:8 Changed 8 years ago by nickm

Component: Tor ClientTor
Note: See TracTickets for help on using tickets.