X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=builder;h=ac46689e0656b7a2e32bc206d9113a227b25ccd5;hb=ac1cf812d18fa31014688551599f1a632262bba0;hp=7438909283501d46fdc892067c10087e7e922040;hpb=b515f9e1a94a2107397d9fac2e8fd9a6503b975f;p=moonshot.git diff --git a/builder b/builder index 7438909..ac46689 100755 --- a/builder +++ b/builder @@ -70,7 +70,10 @@ def build(package): with current_directory(package): try: os.makedirs( "m4") except OSError: pass - run_cmd(('autoreconf', '-i', '-f')) + #On Centos, freeradius produces an invalid configure script + # They check in a configure script anyway so we don't need autoconf + if package != "freeradius-server": + run_cmd(('autoreconf', '-i', '-f')) configure_command = [ './configure'] + configure_opts if len(schroot_command) > 0: @@ -83,7 +86,10 @@ def build(package): try: os.mkdir('doc/api') except: pass #Currently freeradius's make dist is broken - if not package == "freeradius-server": + if package == "freeradius-server": + run_cmd(root_command + " git archive --prefix=freeradius-server/ HEAD |gzip -9 >freeradius-server.tar.gz", shell=True) + run_cmd('cp *.tar.gz freeradius-server.spec ' +dist_dir, shell=True) + else: #not specially handled run_cmd(root_command +' make dist-gzip', shell=True) run_cmd('cp *.tar.gz ' +dist_dir, shell=True) run_cmd(schroot_command + ' make -j3', shell=True) @@ -147,6 +153,7 @@ configure_opts = ['--prefix', prefix, '--with-system-libtool', '--with-system-libltdl', '--enable-tls', '--with-gssapi='+prefix, "--with-xmltooling="+prefix, + '--with-systemdsystemunitdir=' + prefix+'/lib/systemd', ] if options.configure_opts is not None: configure_opts.extend(options.configure_opts)