diff options
| author | David Lamparter <equinox@diac24.net> | 2018-08-16 00:56:48 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-08-30 08:06:44 +0200 |
| commit | 84c5337efd77b707426f4fcb987619d6f572daa1 (patch) | |
| tree | c8c3b3d1b51de8767b1904edf58abbb86a2fb85f /solaris | |
| parent | build: trigger fewer unneccessary clippy rebuilds (diff) | |
| download | frr-84c5337efd77b707426f4fcb987619d6f572daa1.tar.xz frr-84c5337efd77b707426f4fcb987619d6f572daa1.zip | |
build: fix some oddities in solaris/
target_* is always wrong for FRR because we are not a compiler. We only
use host_* and build_*.
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'solaris')
| -rw-r--r-- | solaris/Makefile.am | 15 | ||||
| -rw-r--r-- | solaris/pkginfo.tmpl.in | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/solaris/Makefile.am b/solaris/Makefile.am index 5633991d1..165908204 100644 --- a/solaris/Makefile.am +++ b/solaris/Makefile.am @@ -8,7 +8,7 @@ # derived variables. pkg_names = daemons dev doc libs smf pkg_frr_daemons = zebra bgpd ospfd ospf6d ripd ripngd -pkg_name_rev = @PACKAGE_VERSION@-@CONFDATE@-@target_os@-@target_cpu@ +pkg_name_rev = @PACKAGE_VERSION@-@CONFDATE@-@host_os@-@host_cpu@ pkg_depends = $(pkg_names:%=depend.%) pkg_packages = $(pkg_names:%=@PACKAGE_TARNAME@-%-$(pkg_name_rev).pkg) pkg_pkginfos = $(pkg_names:%=pkginfo.%.full) @@ -37,13 +37,12 @@ edit = $(SED) \ -e 's,@enable_vty_group\@,$(enable_vty_group),g' \ -e 's,@frr_statedir\@,$(frr_statedir),g' \ -e 's,[@]PACKAGE_NAME[@],@PACKAGE_NAME@,g' \ - -e 's,[@]PACKAGE_TARNAME[@],@PACKAGE_TARNAME@,g' \ - -e 's,[@]PACKAGE_VERSION[@],@PACKAGE_VERSION@,g' \ - -e 's,[@]PACKAGE_BUGREPORT[@],@PACKAGE_BUGREPORT@,g' \ - -e 's,[@]CONFDATE[@],@CONFDATE@,g' \ - -e 's,[@]target_cpu[@],$(target_cpu),g' \ - -e 's,[@]target_host[@],$(target_host),g' \ - -e 's,[@]target_os[@],$(target_os),g' + -e 's,[@]PACKAGE_TARNAME[@],@PACKAGE_TARNAME@,g' \ + -e 's,[@]PACKAGE_VERSION[@],@PACKAGE_VERSION@,g' \ + -e 's,[@]PACKAGE_BUGREPORT[@],@PACKAGE_BUGREPORT@,g' \ + -e 's,[@]CONFDATE[@],@CONFDATE@,g' \ + -e 's,[@]host_cpu[@],$(host_cpu),g' \ + -e 's,[@]host_os[@],$(host_os),g' # common options for pkgmk pkg_make_vars = exec_prefix=@exec_prefix@ prefix=@prefix@ \ diff --git a/solaris/pkginfo.tmpl.in b/solaris/pkginfo.tmpl.in index 89a281ceb..ffbf9b9ce 100644 --- a/solaris/pkginfo.tmpl.in +++ b/solaris/pkginfo.tmpl.in @@ -1,4 +1,4 @@ -ARCH="@target_cpu@" +ARCH="@host_cpu@" CATEGORY="system" VERSION="@PACKAGE_VERSION@,REV=@CONFDATE@" VENDOR="http://www.frrouting.org/" |